Michael Niedermayer 9818bbde53 Merge commit 'e0c53c3408181d2e7d544eb65fc7355a79438dfe' ...

* commit 'e0c53c3408181d2e7d544eb65fc7355a79438dfe':
  nut: use meaningful error values
  FATE: use a less ambiguous end time for filter-trim-time test

Conflicts:
	libavformat/nutdec.c
	tests/fate/filter-video.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>

2013-05-08 12:47:54 +02:00

..

fate

Merge commit 'e0c53c3408181d2e7d544eb65fc7355a79438dfe'

2013-05-08 12:47:54 +02:00

filtergraphs

fate: add bitexact flags to alphaextract/alphamerge tests.

2013-04-29 22:28:37 +02:00

ref

Merge remote-tracking branch 'qatar/master'

2013-05-07 11:35:07 +02:00

audiogen.c

Merge commit '511cf612ac979f536fd65e14603a87ca5ad435f3'

2012-12-21 17:32:52 +01:00

base64.c

…

copycooker.sh

…

fate-run.sh

fate/pixfmts: use the appropriate variable names for temporary files.

2013-05-01 13:25:42 +02:00

fate-update.sh

…

fate-valgrind.supp

…

fate.sh

Merge remote-tracking branch 'qatar/master'

2012-09-06 16:23:17 +02:00

ffserver-regression.sh

…

ffserver.conf

…

ffserver.regression.ref

…

lavf-regression.sh

Merge commit 'b333f3a22a4db4cf65d6a0457ac82ecbe7c7ac44'

2013-05-03 11:41:48 +02:00

lena.pnm

…

Makefile

Merge commit '95e8ac60f8b7317ce23c648250fdc8fb68d65a07'

2013-05-05 10:36:23 +02:00

md5.sh

Merge commit '3dc06b6972cf389269e9c36ff0a4373f80f7149b'

2012-10-16 14:04:14 +02:00

regression-funcs.sh

…

rotozoom.c

…

test.ffmeta

fate/ffprobe: add some stream metadata.

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

tiny_psnr.c

Merge commit '3dc06b6972cf389269e9c36ff0a4373f80f7149b'

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

…

videogen.c

…