Michael Niedermayer 2cf521718d Merge commit '35c6ce76b107225a19eb33aea38857d2405882af' ...

* commit '35c6ce76b107225a19eb33aea38857d2405882af':
  Canopus HQX decoder

Conflicts:
	Changelog
	libavcodec/avcodec.h
	libavcodec/version.h
	tests/fate/video.mak

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

2015-02-23 12:19:26 +01:00

..

fate

Merge commit '35c6ce76b107225a19eb33aea38857d2405882af'

2015-02-23 12:19:26 +01:00

filtergraphs

…

ref

Merge commit '35c6ce76b107225a19eb33aea38857d2405882af'

2015-02-23 12:19:26 +01:00

audiogen.c

Merge commit '4b1f5e5090abed6c618c8ba380cd7d28d140f867'

2014-08-15 21:26:12 +02:00

base64.c

…

copycooker.sh

…

fate-run.sh

Merge commit 'a982c5d74fbc7ff5bd2f2f73af61ae48e9b1bcc6'

2015-02-21 12:08:31 +01:00

fate-valgrind.supp

…

fate.sh

tests/fate.sh: If cat *.rep fails try it with a for loop.

2014-07-28 18:34:16 +02:00

ffserver-regression.sh

…

ffserver.conf

ffserver: tests, force +global_header for ASF

2014-09-07 18:01:43 -03:00

ffserver.regression.ref

…

lavf-regression.sh

test/fate: added mxf_opatom regression tests

2015-02-10 11:28:53 +01:00

Makefile

tests/fate: added mxf tests for essencegroups and missing index

2015-01-28 05:45:32 +01:00

md5.sh

…

reference.pnm

Replace lena.pnm

2014-11-28 17:55:27 -05:00

regression-funcs.sh

tests/regression-funcs: Remove hardcoded threads 1

2015-01-03 15:09:12 +01:00

rotozoom.c

…

test.ffmeta

…

tiny_psnr.c

tests/tiny_psnr: remove redundant initialization

2014-11-13 17:54:20 +01:00

tiny_ssim.c

tests/tiny_ssim: more correct error message

2014-05-05 19:00:14 +02:00

utils.c

tests/utils: Remove unneeded L suffix

2015-02-01 22:38:11 +01:00

videogen.c

tests: allow passing dimensions to videogen

2014-05-29 21:26:48 +02:00