Wim Taymans 1fffbe9876 Merge branch 'master' into 0.11 ... Conflicts: ext/ffmpeg/gstffmpegcodecmap.c		2011-10-27 16:31:30 +02:00
..
ffmpeg	Merge branch 'master' into 0.11	2011-10-27 16:31:30 +02:00
libpostproc	ffmpeg: fix some caps	2011-06-20 10:42:30 +02:00
libswscale	ffmpeg: convert to new caps	2011-08-22 13:33:31 +02:00
Makefile.am	Rewrite ffvideoscale using libswscale and put into a separate plugin.	2008-10-08 13:11:54 +00:00