Michael Niedermayer 60ef0c6f90 Merge commit '60fd7d36c47d62d4c603bf16c213b1a924f5cfcf' ... * commit '60fd7d36c47d62d4c603bf16c213b1a924f5cfcf': fate: correctly set sample rate for mp2 tests Conflicts: tests/fate/acodec.mak tests/lavf-regression.sh one hunk has been ommited as it breaks fate Merged-by: Michael Niedermayer <michaelni@gmx.at>		2014-04-09 13:58:55 +02:00
..
fate	fate: correctly set sample rate for mp2 tests	2014-04-09 02:11:25 +02:00
filtergraphs	Merge remote-tracking branch 'qatar/master'	2014-03-16 14:32:47 +01:00
ref	Merge commit 'b6a09ef700786b4e1e871dfa0f5c386ea43bbd0a'	2014-04-09 04:06:35 +02:00
audiogen.c
base64.c
copycooker.sh
fate-run.sh	Fix TARGET_SAMPLES and TARGET_PATH for some fate tests.	2014-03-18 01:29:50 +01:00
fate-update.sh
fate-valgrind.supp
fate.sh
ffserver-regression.sh
ffserver.conf
ffserver.regression.ref
lavf-regression.sh	Merge commit '60fd7d36c47d62d4c603bf16c213b1a924f5cfcf'	2014-04-09 13:58:55 +02:00
lena.pnm
Makefile	Fix TARGET_SAMPLES and TARGET_PATH for some fate tests.	2014-03-18 01:29:50 +01:00
md5.sh
regression-funcs.sh	Fix TARGET_SAMPLES and TARGET_PATH for some fate tests.	2014-03-18 01:29:50 +01:00
rotozoom.c
test.ffmeta
tiny_psnr.c	tests/tiny_psnr: Print information about the supported sample types in the help and error texts	2014-03-24 04:02:51 +01:00
tiny_ssim.c	tests/tiny_ssim: drop isatty() support	2014-02-21 17:29:58 +01:00
utils.c
videogen.c