Michael Niedermayer bb3ed3bae6 Merge remote-tracking branch 'qatar/master' ... * qatar/master: fate: Add FATE tests for the Ut Video encoder lavc: add Ut Video encoder mpegvideo_enc: remove stray duplicate line from 7f9aaa4 swscale: x86: fix #endif comments in rgb2rgb template file avconv: mark more options as expert. avconv: split printing "main options" into global and per-file. avconv: refactor help printing. Conflicts: Changelog ffmpeg_opt.c ffserver.c libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>		2012-08-20 17:31:55 +02:00
..
fate	Merge remote-tracking branch 'qatar/master'	2012-08-20 17:31:55 +02:00
lavf	ffmpeg: Do not discard slightly invalid timestamps.	2012-08-12 01:22:48 +02:00
lavf-fate	…
lavfi	lavfi: add edgedetect filter.	2012-08-16 22:03:32 +02:00
seek	…
vsynth1	…
vsynth2	…