Commit 087d1e07 authored by Mark Nauwelaerts's avatar Mark Nauwelaerts

Merge remote-tracking branch 'origin/0.10'

Conflicts:
	gst/h264parse/gsth264parse.c
	gst/videoparsers/gsth264parse.c
parents 8238f14b 81b71b65
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment