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

Sebastian Dröge slomo at kemper.freedesktop.org
Tue Jan 10 05:33:27 PST 2012


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

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

Merge branch 'master' into 0.11

Conflicts:
	ext/cairo/gsttextoverlay.c
	ext/pulse/pulseaudiosink.c
	gst/audioparsers/gstaacparse.c
	gst/avi/gstavimux.c
	gst/flv/gstflvmux.c
	gst/interleave/interleave.c
	gst/isomp4/gstqtmux.c
	gst/matroska/matroska-demux.c
	gst/matroska/matroska-mux.c
	gst/matroska/matroska-mux.h
	gst/matroska/matroska-read-common.c
	gst/multifile/gstmultifilesink.c
	gst/multipart/multipartmux.c
	gst/shapewipe/gstshapewipe.c
	gst/smpte/gstsmpte.c
	gst/udp/gstmultiudpsink.c
	gst/videobox/gstvideobox.c
	gst/videocrop/gstaspectratiocrop.c
	gst/videomixer/videomixer.c
	gst/videomixer/videomixer2.c
	gst/wavparse/gstwavparse.c
	po/ja.po
	po/lv.po
	po/sr.po
	tests/check/Makefile.am
	tests/check/elements/qtmux.c
	tests/check/elements/rgvolume.c

---





More information about the gstreamer-commits mailing list