aboutsummaryrefslogtreecommitdiffstats
path: root/libswscale/swscale.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-08-20 17:15:15 +0200
committerMichael Niedermayer <michaelni@gmx.at>2012-08-20 17:31:55 +0200
commitbb3ed3bae6a9e6e2dbe8deeb45088453f214b770 (patch)
tree2cb536f24abb5d9cfc275848da43d93d4302d0d2 /libswscale/swscale.c
parentaee51039ee204197fdb4c924f8ee433b803ab1e1 (diff)
parentb96509c93ce6ebb0e997e0b2a55cf10c786a2812 (diff)
downloadffmpeg-bb3ed3bae6a9e6e2dbe8deeb45088453f214b770.tar.gz
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>
Diffstat (limited to 'libswscale/swscale.c')
0 files changed, 0 insertions, 0 deletions