Wim Taymans b0cc0cf55d Merge branch 'master' into 0.11 ... Conflicts: gst-libs/ext/libav		2012-03-22 15:31:40 +01:00
..
ffmpeg	Merge branch 'master' into 0.11	2012-03-22 15:31:40 +01:00
libpostproc	ffmpeg: Fix merge mistakes	2012-01-10 11:39:27 +01:00
libswscale	fix for caps api changes	2012-03-11 19:07:31 +01:00
Makefile.am	Allow building a LGPL only gst-ffmpeg plugin	2011-10-31 10:59:27 +01:00