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 72f951f6d7

commit 4d744d7027

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 Not Available