Michael Niedermayer d828b08143 Merge commit '8895bf7b78650c0c21c88cec0484e138ec511a4b' ... * commit '8895bf7b78650c0c21c88cec0484e138ec511a4b': Replace lena.pnm Conflicts: tests/Makefile tests/ref/seek/vsynth2-asv1 tests/ref/seek/vsynth2-asv2 tests/ref/seek/vsynth2-ffv1 tests/ref/seek/vsynth2-flashsv tests/ref/seek/vsynth2-flv tests/ref/seek/vsynth2-h261 tests/ref/seek/vsynth2-h263 tests/ref/seek/vsynth2-h263p tests/ref/seek/vsynth2-huffyuv tests/ref/seek/vsynth2-ljpeg tests/ref/seek/vsynth2-mjpeg tests/ref/seek/vsynth2-mpeg1 tests/ref/seek/vsynth2-mpeg1b tests/ref/seek/vsynth2-mpeg2-422 tests/ref/seek/vsynth2-mpeg2-idct-int tests/ref/seek/vsynth2-mpeg2-ilace tests/ref/seek/vsynth2-mpeg2-ivlc-qprd tests/ref/seek/vsynth2-mpeg2-thread tests/ref/seek/vsynth2-mpeg2-thread-ivlc tests/ref/seek/vsynth2-mpeg4 tests/ref/seek/vsynth2-mpeg4-adap tests/ref/seek/vsynth2-mpeg4-error tests/ref/seek/vsynth2-mpeg4-nr tests/ref/seek/vsynth2-mpeg4-qpel tests/ref/seek/vsynth2-mpeg4-qprd tests/ref/seek/vsynth2-mpeg4-rc tests/ref/seek/vsynth2-mpeg4-thread tests/ref/seek/vsynth2-msmpeg4 tests/ref/seek/vsynth2-msmpeg4v2 tests/ref/seek/vsynth2-roqvideo tests/ref/seek/vsynth2-rv10 tests/ref/seek/vsynth2-rv20 tests/ref/seek/vsynth2-svq1 tests/ref/seek/vsynth2-wmv1 tests/ref/seek/vsynth2-wmv2 tests/ref/vsynth/vsynth2-asv1 tests/ref/vsynth/vsynth2-asv2 tests/ref/vsynth/vsynth2-cljr tests/ref/vsynth/vsynth2-dnxhd-1080i tests/ref/vsynth/vsynth2-dnxhd-720p tests/ref/vsynth/vsynth2-dnxhd-720p-10bit tests/ref/vsynth/vsynth2-dnxhd-720p-rd tests/ref/vsynth/vsynth2-dv tests/ref/vsynth/vsynth2-dv-411 tests/ref/vsynth/vsynth2-dv-50 tests/ref/vsynth/vsynth2-ffv1 tests/ref/vsynth/vsynth2-ffvhuff tests/ref/vsynth/vsynth2-flashsv tests/ref/vsynth/vsynth2-flv tests/ref/vsynth/vsynth2-h261 tests/ref/vsynth/vsynth2-h263 tests/ref/vsynth/vsynth2-h263-obmc tests/ref/vsynth/vsynth2-h263p tests/ref/vsynth/vsynth2-huffyuv tests/ref/vsynth/vsynth2-jpegls tests/ref/vsynth/vsynth2-ljpeg tests/ref/vsynth/vsynth2-mjpeg tests/ref/vsynth/vsynth2-mpeg1 tests/ref/vsynth/vsynth2-mpeg1b tests/ref/vsynth/vsynth2-mpeg2 tests/ref/vsynth/vsynth2-mpeg2-422 tests/ref/vsynth/vsynth2-mpeg2-idct-int tests/ref/vsynth/vsynth2-mpeg2-ilace tests/ref/vsynth/vsynth2-mpeg2-ivlc-qprd tests/ref/vsynth/vsynth2-mpeg2-thread tests/ref/vsynth/vsynth2-mpeg2-thread-ivlc tests/ref/vsynth/vsynth2-mpeg4 tests/ref/vsynth/vsynth2-mpeg4-adap tests/ref/vsynth/vsynth2-mpeg4-adv tests/ref/vsynth/vsynth2-mpeg4-error tests/ref/vsynth/vsynth2-mpeg4-nr tests/ref/vsynth/vsynth2-mpeg4-qpel tests/ref/vsynth/vsynth2-mpeg4-qprd tests/ref/vsynth/vsynth2-mpeg4-rc tests/ref/vsynth/vsynth2-mpeg4-thread tests/ref/vsynth/vsynth2-msmpeg4 tests/ref/vsynth/vsynth2-msmpeg4v2 tests/ref/vsynth/vsynth2-prores tests/ref/vsynth/vsynth2-qtrle tests/ref/vsynth/vsynth2-rgb tests/ref/vsynth/vsynth2-roqvideo tests/ref/vsynth/vsynth2-rv10 tests/ref/vsynth/vsynth2-rv20 tests/ref/vsynth/vsynth2-svq1 tests/ref/vsynth/vsynth2-v210 tests/ref/vsynth/vsynth2-wmv1 tests/ref/vsynth/vsynth2-wmv2 tests/ref/vsynth/vsynth2-yuv See: c4abee734d Merged-by: Michael Niedermayer <michaelni@gmx.at>		2014-11-30 18:39:21 +01:00
..
fate	xface: Fix encoder crashes due to too small on-stack array.	2014-11-23 06:51:18 +01:00
filtergraphs
ref	avcodec/adxenc: fix rounding	2014-11-30 12:56:02 +01:00
audiogen.c
base64.c
copycooker.sh
fate-run.sh	tests: Fix test name for pixfmts tests	2014-11-09 21:37:18 -08:00
fate-valgrind.supp
fate.sh
ffserver-regression.sh
ffserver.conf
ffserver.regression.ref
lavf-regression.sh
Makefile	Replace lena.pnm	2014-11-28 17:55:27 -05:00
md5.sh
reference.pnm	Replace lena.pnm	2014-11-28 17:55:27 -05:00
regression-funcs.sh
rotozoom.c
test.ffmeta
tiny_psnr.c	tests/tiny_psnr: remove redundant initialization	2014-11-13 17:54:20 +01:00
tiny_ssim.c
utils.c	tests/utils: make arguments const that arent changed	2014-09-19 20:25:30 +02:00
videogen.c