Merge remote-tracking branch 'origin/master' into 0.11

Browse source

Conflicts:
	ext/opus/gstopusdec.c
	ext/opus/gstopusparse.c
	gst-libs/gst/video/gstbasevideodecoder.c
	gst-libs/gst/video/gstbasevideodecoder.h

...

This commit is contained in:

Tim-Philipp Müller 2011-11-26 15:37:25 +00:00

parent d459955d0d 81b71b65ee

commit bbaf1dad99

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show stats Download patch file Download diff file Expand all files Collapse all files

Diff content is not available