Wim Taymans 8faa991476 Merge branch 'master' into 0.11 ... Conflicts: ext/ffmpeg/gstffmpegdec.c		2011-04-07 12:11:37 +02:00
..
ffmpeg	Merge branch 'master' into 0.11	2011-04-07 12:11:37 +02:00
libpostproc	ffmpeg: port to new memory API	2011-04-04 13:18:13 +02:00
libswscale	ffmpeg: port to new memory API	2011-04-04 13:18:13 +02:00
Makefile.am	Rewrite ffvideoscale using libswscale and put into a separate plugin.	2008-10-08 13:11:54 +00:00