Michael Niedermayer 7ec7d626a1 Merge commit 'aae159a7cc4df7d0521901022b778c9da251c24e' ... * commit 'aae159a7cc4df7d0521901022b778c9da251c24e': nuv: Do not ignore lzo decompression failures Conflicts: libavcodec/nuv.c tests/ref/fate/nuv-rtjpeg Merged-by: Michael Niedermayer <michaelni@gmx.at>		2013-08-14 10:10:14 +02:00
..
fate	tests/fli: avoid rounding errors in -t option.	2013-08-10 20:17:10 +02:00
filtergraphs	…
ref	Merge commit 'aae159a7cc4df7d0521901022b778c9da251c24e'	2013-08-14 10:10:14 +02:00
Makefile	Merge commit 'c47037c7a17e4026d38dfa41da27b9f91506725b'	2013-07-30 10:36:04 +02:00
audiogen.c	Merge remote-tracking branch 'qatar/master'	2013-07-26 11:12:11 +02:00
base64.c	…
copycooker.sh	…
fate-run.sh	…
fate-update.sh	…
fate-valgrind.supp	…
fate.sh	fate: Always enable avresample	2013-07-10 15:12:05 -04:00
ffserver-regression.sh	…
ffserver.conf	…
ffserver.regression.ref	…
lavf-regression.sh	pnmdec: always output native pixel format	2013-08-03 15:00:15 +02:00
lena.pnm	…
md5.sh	…
regression-funcs.sh	…
rotozoom.c	…
test.ffmeta	…
tiny_psnr.c	tests/tiny_psnr: remove unneeded include assert.h	2013-07-19 18:55:49 +02:00
tiny_ssim.c	…
utils.c	…
videogen.c	…