diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-17 21:58:16 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-17 21:58:16 +0100 |
| commit | ae3d2afd46806531c30b0e343963ade09220148d (patch) | |
| tree | 1b95c5e747d99e4f27071ee3bb00f2308a6a06f8 /tests | |
| parent | c7e1e4c48aee1c873759c693bf4d093d362f4821 (diff) | |
| parent | 6289706b35d1b030258bba54cc27bb6d2c04bc9b (diff) | |
| download | ffmpeg-ae3d2afd46806531c30b0e343963ade09220148d.tar.gz | |
Merge commit '6289706b35d1b030258bba54cc27bb6d2c04bc9b'
* commit '6289706b35d1b030258bba54cc27bb6d2c04bc9b':
fate: Move tdsc to the appropriate screen capture file
Conflicts:
tests/fate/video.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/fate/screen.mak | 3 | ||||
| -rw-r--r-- | tests/fate/video.mak | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/tests/fate/screen.mak b/tests/fate/screen.mak index 72e9b4ccc6..c66cd958a8 100644 --- a/tests/fate/screen.mak +++ b/tests/fate/screen.mak @@ -29,6 +29,9 @@ fate-fraps-v5: CMD = framecrc -i $(TARGET_SAMPLES)/fraps/fraps-v5-bouncing-balls FATE_SCREEN-$(call DEMDEC, AVI, FRAPS) += $(FATE_FRAPS) fate-fraps: $(FATE_FRAPS) +FATE_SAMPLES_AVCONV-$(call DEMDEC, ASF, TDSC) += fate-tdsc +fate-tdsc: CMD = framecrc -idct simple -i $(TARGET_SAMPLES)/tdsc/tdsc.asf -an -pix_fmt bgr24 + FATE_TSCC += fate-tscc-15bit fate-tscc-15bit: CMD = framecrc -i $(TARGET_SAMPLES)/tscc/oneminute.avi -t 15 -pix_fmt rgb24 diff --git a/tests/fate/video.mak b/tests/fate/video.mak index 47f1d39f66..08eae8642d 100644 --- a/tests/fate/video.mak +++ b/tests/fate/video.mak @@ -256,9 +256,6 @@ 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 |