[0.11] gst-ffmpeg: Merge branch 'master' into 0.11

Sebastian Dröge slomo at kemper.freedesktop.org
Tue Jan 10 02:39:46 PST 2012


Module: gst-ffmpeg
Branch: 0.11
Commit: bde3117e727fa2dacac7cc422dba6cff06ebe651
URL:    http://cgit.freedesktop.org/gstreamer/gst-ffmpeg/commit/?id=bde3117e727fa2dacac7cc422dba6cff06ebe651

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

Merge branch 'master' into 0.11

Conflicts:
	configure.ac
	ext/ffmpeg/gstffmpegcodecmap.c
	ext/ffmpeg/gstffmpegdec.c
	ext/ffmpeg/gstffmpegdeinterlace.c
	ext/ffmpeg/gstffmpegmux.c
	ext/libswscale/gstffmpegscale.c

---





More information about the gstreamer-commits mailing list