diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-13 23:17:54 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-13 23:23:01 +0100 |
commit | e1f37c48e54f98d34f8a032e1d96f7a135a8545d (patch) | |
tree | 74c11781b08a32228c081d6e679d778b6ac686a5 /tests/fate/video.mak | |
parent | fa4bb7c5b249da60cd16113b795a64f0055ef164 (diff) | |
parent | 247e370e2a913db52ca079b347a174c8d393b171 (diff) | |
download | ffmpeg-e1f37c48e54f98d34f8a032e1d96f7a135a8545d.tar.gz |
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>
Diffstat (limited to 'tests/fate/video.mak')
-rw-r--r-- | tests/fate/video.mak | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/tests/fate/video.mak b/tests/fate/video.mak index 08eae8642d..47f1d39f66 100644 --- a/tests/fate/video.mak +++ b/tests/fate/video.mak @@ -256,6 +256,9 @@ fate-smc: CMD = framecrc -i $(TARGET_SAMPLES)/smc/cass_schi.qt -pix_fmt rgb24 FATE_VIDEO-$(call DEMDEC, AVI, SP5X) += fate-sp5x fate-sp5x: CMD = framecrc -idct simple -i $(TARGET_SAMPLES)/sp5x/sp5x_problem.avi +FATE_VIDEO-$(call DEMDEC, ASF, TDSC) += fate-tdsc +fate-tdsc: CMD = framecrc -idct simple -i $(TARGET_SAMPLES)/tdsc/tdsc.asf -an -pix_fmt bgr24 + FATE_VIDEO-$(call DEMDEC, THP, THP) += fate-thp fate-thp: CMD = framecrc -idct simple -i $(TARGET_SAMPLES)/thp/pikmin2-opening1-partial.thp -an |