gstreamer/ext
Sebastian Dröge bde3117e72 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
2012-01-10 11:35:55 +01:00
..
ffmpeg Merge branch 'master' into 0.11 2012-01-10 11:35:55 +01:00
libpostproc Merge branch 'master' into 0.11 2012-01-10 11:35:55 +01:00
libswscale ffmpeg: fix pad template ref leaks 2011-11-28 13:23:42 +00:00
Makefile.am Allow building a LGPL only gst-ffmpeg plugin 2011-10-31 10:59:27 +01:00