ffmpeg/tests
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
Makefile Merge commit '96a06dbaf278e8152487e08772946f63bd2a3843' 2015-03-10 10:58:44 +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
md5.sh
reference.pnm
regression-funcs.sh
rotozoom.c
test.ffmeta
tiny_psnr.c
tiny_ssim.c
utils.c
videogen.c