diff options
author | Clément Bœsch <clement@stupeflix.com> | 2016-06-21 13:45:58 +0300 |
---|---|---|
committer | Clément Bœsch <clement@stupeflix.com> | 2016-06-21 13:50:03 +0300 |
commit | 7cf4b442cebd9bb8a0e2602f3fda2edbbdfb39c8 (patch) | |
tree | fbd5e11df133030d607bd4fc7cbc0c9a543f91e8 /tests/fate/microsoft.mak | |
parent | f36fcf7b6cc40cfcad0642cc1c6ed0ceb39b2143 (diff) | |
parent | 5b1409c75563b4a3aca113c34d09e3b5442de47f (diff) |
Merge commit '5b1409c75563b4a3aca113c34d09e3b5442de47f'
* commit '5b1409c75563b4a3aca113c34d09e3b5442de47f':
fate: Add test for MSS1
Test was already present, see 849e55e58ecc6815e8bd326ac18dda748db48682.
The merge removes the audio decoding present in our version and
simplifies the rules.
Merged-by: Clément Bœsch <clement@stupeflix.com>
Diffstat (limited to 'tests/fate/microsoft.mak')
-rw-r--r-- | tests/fate/microsoft.mak | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/tests/fate/microsoft.mak b/tests/fate/microsoft.mak index 1d518d9bd0..524fb70160 100644 --- a/tests/fate/microsoft.mak +++ b/tests/fate/microsoft.mak @@ -1,11 +1,8 @@ FATE_MICROSOFT-$(call DEMDEC, AVI, MSMPEG4V1) += fate-msmpeg4v1 fate-msmpeg4v1: CMD = framecrc -flags +bitexact -idct simple -i $(TARGET_SAMPLES)/msmpeg4v1/mpg4.avi -an -FATE_MSS1 += fate-mss1-pal -fate-mss1-pal: CMD = framecrc -i $(TARGET_SAMPLES)/mss1/screen_codec.wmv - -FATE_SAMPLES_AVCONV-$(call DEMDEC, ASF, MSS1) += $(FATE_MSS1) -fate-mss1: $(FATE_MSS1) +FATE_SAMPLES_AVCONV-$(call DEMDEC, ASF, MSS1) += fate-mss1-pal +fate-mss1-pal: CMD = framecrc -i $(TARGET_SAMPLES)/mss1/screen_codec.wmv -an FATE_MSS2 += fate-mss2-pal fate-mss2-pal: CMD = framecrc -i $(TARGET_SAMPLES)/mss2/rlepal.wmv |