Merge remote-tracking branch 'origin/0.10'

Browse source

Conflicts:
	gst/h264parse/gsth264parse.c
	gst/videoparsers/gsth264parse.c

...

This commit is contained in:

Mark Nauwelaerts 2012-04-06 14:52:12 +02:00

parent 8238f14b81 81b71b65ee

commit 087d1e0754

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