Tim-Philipp Müller 77361e2919 Merge remote-tracking branch 'origin/master' into 0.11 ... Conflicts: ext/opus/gstopusdec.c ext/opus/gstopusparse.c gst-libs/gst/video/gstbasevideodecoder.c gst-libs/gst/video/gstbasevideodecoder.h		2011-11-26 15:37:25 +00:00
..
gst	Merge remote-tracking branch 'origin/master' into 0.11	2011-11-26 15:37:25 +00:00
Makefile.am	Use external shared libamrwb. Fixes #423741 (with lots of cleanup).	2007-05-16 13:50:51 +00:00