gstreamer/gst-libs
Wim Taymans bc6ed0bf97 Merge branch 'master' into 0.11
Conflicts:
	ext/celt/gstceltdec.c
	ext/opus/gstopusdec.c
	ext/opus/gstopusdec.h
	ext/opus/gstopusenc.c
	ext/opus/gstopusenc.h
	ext/opus/gstopusparse.c
2011-11-17 17:32:42 +01:00
..
gst Merge branch 'master' into 0.11 2011-11-17 17:32:42 +01:00
Makefile.am Use external shared libamrwb. Fixes (with lots of cleanup). 2007-05-16 13:50:51 +00:00