Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 20 Aug 2012 15:15:15 +0000 (17:15 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 20 Aug 2012 15:31:55 +0000 (17:31 +0200)
commitbb3ed3bae6a9e6e2dbe8deeb45088453f214b770
tree2cb536f24abb5d9cfc275848da43d93d4302d0d2
parentaee51039ee204197fdb4c924f8ee433b803ab1e1
parentb96509c93ce6ebb0e997e0b2a55cf10c786a2812
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>
18 files changed:
Changelog
cmdutils.c
cmdutils.h
doc/general.texi
ffmpeg_opt.c
ffplay.c
ffprobe.c
ffserver.c
libavcodec/Makefile
libavcodec/allcodecs.c
libavcodec/utvideo.c
libavcodec/utvideo.h
libavcodec/utvideodec.c
libavcodec/utvideoenc.c
libavcodec/version.h
tests/ref/fate/utvideoenc_yuv422_left
tests/ref/fate/utvideoenc_yuv422_median
tests/ref/fate/utvideoenc_yuv422_none