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

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


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

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

Merge branch 'master' into 0.11

Conflicts:
	ext/a52dec/gsta52dec.c
	ext/a52dec/gsta52dec.h
	ext/lame/gstlame.c
	ext/lame/gstlame.h
	ext/lame/gstlamemp3enc.c
	ext/mad/gstmad.c
	ext/mad/gstmad.h
	gst/mpegaudioparse/gstmpegaudioparse.c
	gst/mpegstream/gstdvddemux.c
	gst/realmedia/rdtdepay.c
	po/es.po
	po/lv.po
	po/sr.po

---





More information about the gstreamer-commits mailing list