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

fate/filter: test gradfun timeline.

2013-05-12 13:07:47 +02:00

ref

Merge commit 'aae159a7cc4df7d0521901022b778c9da251c24e'

2013-08-14 10:10:14 +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

Merge commit 'bd392785a75d7d51414a9788d50396a8d9f29d77'

2013-05-08 14:21:39 +02:00

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

…

Makefile

Merge commit 'c47037c7a17e4026d38dfa41da27b9f91506725b'

2013-07-30 10:36:04 +02:00

md5.sh

Merge commit '3dc06b6972cf389269e9c36ff0a4373f80f7149b'

2012-10-16 14:04:14 +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

test.ffmeta

fate/ffprobe: add some stream metadata.

2012-10-08 11:03:27 +02:00

tiny_psnr.c

tests/tiny_psnr: remove unneeded include assert.h

2013-07-19 18:55:49 +02:00

tiny_ssim.c

tests/tiny_ssim: include the 2 macros instead of a header

2013-03-27 01:38:18 +01: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