gstreamer/ext
Wim Taymans f566dae7dc 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
..
opus Merge branch 'master' into 0.11 2011-11-17 17:32:42 +01:00