diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2015-07-02 00:34:24 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2015-07-02 00:34:24 +0200 |
commit | 03b2b40fd7f010fc245d36c05c7439c058b927bf (patch) | |
tree | 7b50d24beddf2544c6f51a0a078950a7673565c0 /tests/fate/screen.mak | |
parent | 838c5f3df7e98b15fd3acbcacaf315c32600ca45 (diff) | |
parent | a31c4b2cbef9aee15910fc3df52519aef46760de (diff) |
Merge commit 'a31c4b2cbef9aee15910fc3df52519aef46760de'
* commit 'a31c4b2cbef9aee15910fc3df52519aef46760de':
fate-g2m3: disable the audio stream
Conflicts:
tests/ref/fate/g2m3
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/fate/screen.mak')
-rw-r--r-- | tests/fate/screen.mak | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/fate/screen.mak b/tests/fate/screen.mak index 1865441c7b..a37e2e25e2 100644 --- a/tests/fate/screen.mak +++ b/tests/fate/screen.mak @@ -33,7 +33,7 @@ FATE_G2M += fate-g2m2 fate-g2m2: CMD = framecrc -idct simple -i $(TARGET_SAMPLES)/g2m/g2m2.asf -an FATE_G2M += fate-g2m3 -fate-g2m3: CMD = framecrc -idct simple -i $(TARGET_SAMPLES)/g2m/g2m3.asf -frames:v 20 +fate-g2m3: CMD = framecrc -idct simple -i $(TARGET_SAMPLES)/g2m/g2m3.asf -frames:v 20 -an FATE_G2M += fate-g2m4 fate-g2m4: CMD = framecrc -idct simple -i $(TARGET_SAMPLES)/g2m/g2m4.asf |