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

asynth1.sw

movenc: Decrease default chunk merge limit to 1mb.

2012-01-23 23:41:32 +01:00

audiogen.c

Merge remote-tracking branch 'qatar/master'

2012-07-29 02:16:26 +02:00

base64.c

Merge remote-tracking branch 'qatar/master'

2012-01-19 01:19:38 +01:00

copycooker.sh

…

fate_config.sh.template

…

fate-run.sh

Merge remote-tracking branch 'qatar/master'

2012-07-09 22:40:12 +02:00

fate-update.sh

…

fate-valgrind.supp

Add a --valgrind configure option.

2012-01-21 12:04:46 +01:00

fate.sh

mem: heap memory poisoning.

2012-07-02 21:02:15 +02:00

ffserver-regression.sh

…

ffserver.conf

…

ffserver.regression.ref

…

lavf-regression.sh

vocenc: change default codec to 16bit

2012-06-25 03:35:09 +02:00

lavfi-regression.sh

lavfi: add edgedetect filter.

2012-08-16 22:03:32 +02:00

lena.pnm

…

Makefile

fate: Rename FATE_SAMPLES make file variable to FATE_EXTERN

2012-08-04 09:49:30 +02:00

md5.sh

fate: try to fix 3rd md5 implementation

2012-06-01 04:16:23 +02:00

regression-funcs.sh

fate: remove unused functions

2012-05-30 05:57:56 +02:00

rotozoom.c

Merge remote-tracking branch 'qatar/master'

2012-06-07 21:45:52 +02:00

tiny_psnr.c

tiny_psnr: fix undefined shift

2012-08-01 20:00:01 +02:00

utils.c

Merge commit 'f919cc7df6ab844bc12f89fe7bef4fb915a47725'

2012-05-30 01:40:54 +02:00

videogen.c

Merge remote-tracking branch 'qatar/master'

2012-06-07 21:45:52 +02:00