Wim Taymans 1119f6ee41 Merge branch 'master' into 0.11 ...

Conflicts:
	ext/chromaprint/gstchromaprint.c
	ext/mpeg2enc/Makefile.am
	ext/voaacenc/gstvoaacenc.c
	gst/dvbsuboverlay/gstdvbsuboverlay.c
	gst/mpegtsdemux/mpegtsbase.c
	gst/sdp/gstsdpdemux.c
	gst/videoparsers/gsth264parse.c
	sys/d3dvideosink/d3dvideosink.c
	tests/examples/camerabin/gst-camera-perf.c
	tests/examples/camerabin/gst-camerabin-test.c
	tests/examples/camerabin2/gst-camerabin2-test.c
	tests/examples/mxf/mxfdemux-structure.c
	tests/examples/scaletempo/demo-main.c

2012-02-10 16:46:50 +01:00

..

gstvoamrwb.c

amrwbenc: Switch to the free vo-amrwbenc library

2011-05-14 12:08:39 +02:00

gstvoamrwbenc.c

Merge branch 'master' into 0.11

2012-02-10 16:46:50 +01:00

gstvoamrwbenc.h

voamrwbenc: port to audioencoder

2011-11-17 23:04:23 +01:00

GstVoAmrwbEnc.prs

amrwbenc: Switch to the free vo-amrwbenc library

2011-05-14 12:08:39 +02:00

Makefile.am

voamrwbenc: port to audioencoder

2011-11-17 23:04:23 +01:00