[0.11] gst-plugins-bad: Merge branch 'master' into 0.11

Sebastian Dröge slomo at kemper.freedesktop.org
Tue Jan 10 06:50:52 PST 2012


Module: gst-plugins-bad
Branch: 0.11
Commit: a01a4ea2d3e98c7ffcedf67d48a167e5dfdd1c07
URL:    http://cgit.freedesktop.org/gstreamer/gst-plugins-bad/commit/?id=a01a4ea2d3e98c7ffcedf67d48a167e5dfdd1c07

Author: Sebastian Dröge <sebastian.droege at collabora.co.uk>
Date:   Tue Jan 10 15:50:37 2012 +0100

Merge branch 'master' into 0.11

Conflicts:
	gst/mpegtsdemux/tsdemux.c
	gst/videoparsers/gsth264parse.c
	tests/check/elements/camerabin2.c

---





More information about the gstreamer-commits mailing list