Merge branch 'master' into 0.11

Conflicts:
	gst/mpegtsdemux/tsdemux.c
	gst/videoparsers/gsth264parse.c
	tests/check/elements/camerabin2.c
This commit is contained in:
Sebastian Dröge 2012-01-10 15:50:37 +01:00
commit 3454e39b9d

Diff content is not available