Merge branch 'master' into 0.11

Browse source

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

...

This commit is contained in:

Wim Taymans 2011-11-17 17:32:42 +01:00

parent bc402c0f8f 81b71b65ee

commit eeb3f84489

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