gstreamer/gst-libs
Wim Taymans 0a9387c43c Merge branch 'master' into 0.11
Conflicts:
	ext/opus/gstopusdec.c
	ext/opus/gstopusenc.c
	ext/opus/gstopusparse.c
	gst/audiovisualizers/gstwavescope.c
	gst/filter/Makefile.am
	gst/filter/gstfilter.c
	gst/filter/gstiir.c
	gst/playondemand/gstplayondemand.c
2011-11-23 11:08:39 +01:00
..
gst Merge branch 'master' into 0.11 2011-11-23 11:08:39 +01:00
Makefile.am Use external shared libamrwb. Fixes #423741 (with lots of cleanup). 2007-05-16 13:50:51 +00:00