Michael Niedermayer e1f37c48e5 Merge commit '247e370e2a913db52ca079b347a174c8d393b171' ...

* commit '247e370e2a913db52ca079b347a174c8d393b171':
  TDSC decoder

Conflicts:
	Changelog
	doc/general.texi
	libavcodec/Makefile
	libavcodec/allcodecs.c
	libavcodec/version.h
	tests/fate/video.mak

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

2015-03-13 23:23:01 +01:00

..

fate

Merge commit '247e370e2a913db52ca079b347a174c8d393b171'

2015-03-13 23:23:01 +01:00

filtergraphs

…

ref

Merge commit '247e370e2a913db52ca079b347a174c8d393b171'

2015-03-13 23:23:01 +01:00

audiogen.c

…

base64.c

…

copycooker.sh

…

fate-run.sh

Merge commit '96a06dbaf278e8152487e08772946f63bd2a3843'

2015-03-10 10:58:44 +01:00

fate-valgrind.supp

…

fate.sh

…

ffserver-regression.sh

…

ffserver.conf

…

ffserver.regression.ref

…

lavf-regression.sh

test/fate: added mxf_opatom regression tests

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

Makefile

Merge commit '96a06dbaf278e8152487e08772946f63bd2a3843'

2015-03-10 10:58:44 +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

…

tiny_ssim.c

…

utils.c

tests/utils: Remove unneeded L suffix

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

videogen.c

…