gstreamer/ext
Sebastian Dröge e802002d96 Merge branch 'master' into 0.11
Conflicts:
	gst/mpegtsdemux/tsdemux.c
	gst/videoparsers/gsth264parse.c
	tests/check/elements/camerabin2.c
2012-01-10 15:50:37 +01:00
..
opus Merge branch 'master' into 0.11 2012-01-10 15:50:37 +01:00