ffmpeg/tests
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
ref Merge remote-tracking branch 'qatar/master' 2012-08-20 17:31:55 +02:00
Makefile fate: Rename FATE_SAMPLES make file variable to FATE_EXTERN 2012-08-04 09:49:30 +02:00
asynth1.sw
audiogen.c Merge remote-tracking branch 'qatar/master' 2012-07-29 02:16:26 +02:00
base64.c
copycooker.sh
fate-run.sh
fate-update.sh
fate-valgrind.supp
fate.sh
fate_config.sh.template
ffserver-regression.sh
ffserver.conf
ffserver.regression.ref
lavf-regression.sh
lavfi-regression.sh lavfi: add edgedetect filter. 2012-08-16 22:03:32 +02:00
lena.pnm
md5.sh
regression-funcs.sh
rotozoom.c
tiny_psnr.c tiny_psnr: fix undefined shift 2012-08-01 20:00:01 +02:00
utils.c
videogen.c