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 7f9aaa49 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>
Showing
libavcodec/utvideo.c
0 → 100644
libavcodec/utvideo.h
0 → 100644
libavcodec/utvideoenc.c
0 → 100644
This diff is collapsed.
Please
register
or
sign in
to comment