diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-06-28 11:48:31 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-06-28 11:48:49 +0200 |
| commit | 3d2267019cd7ba318d01babc14fdc82ab5496a7c (patch) | |
| tree | 11566861ed714be836c312276d3931cbc62ede51 /tests | |
| parent | fb2eeebf662ef3f3b0600da8471b3ff120afb652 (diff) | |
| parent | 441e8ae5efd681055e5af6f4317fb60110de9dd0 (diff) | |
| download | android_external_ffmpeg-3d2267019cd7ba318d01babc14fdc82ab5496a7c.tar.gz android_external_ffmpeg-3d2267019cd7ba318d01babc14fdc82ab5496a7c.tar.bz2 android_external_ffmpeg-3d2267019cd7ba318d01babc14fdc82ab5496a7c.zip | |
Merge commit '441e8ae5efd681055e5af6f4317fb60110de9dd0'
* commit '441e8ae5efd681055e5af6f4317fb60110de9dd0':
FATE: drop the last truncated frame from the wmapro tests
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/fate/wma.mak | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/fate/wma.mak b/tests/fate/wma.mak index 1b8c5f971c..d2cf4a28ff 100644 --- a/tests/fate/wma.mak +++ b/tests/fate/wma.mak @@ -1,10 +1,10 @@ FATE_WMAPRO-$(call DEMDEC, ASF, WMAPRO) += fate-wmapro-2ch -fate-wmapro-2ch: CMD = pcm -i $(TARGET_SAMPLES)/wmapro/Beethovens_9th-1_small.wma -fate-wmapro-2ch: REF = $(SAMPLES)/wmapro/Beethovens_9th-1_small.pcm +fate-wmapro-2ch: CMD = pcm -i $(TARGET_SAMPLES)/wmapro/Beethovens_9th-1_small.wma -frames 43 +fate-wmapro-2ch: REF = $(SAMPLES)/wmapro/Beethovens_9th-1_small_v2.pcm FATE_WMAPRO-$(call DEMDEC, ASF, WMAPRO) += fate-wmapro-5.1 -fate-wmapro-5.1: CMD = pcm -i $(TARGET_SAMPLES)/wmapro/latin_192_mulitchannel_cut.wma -fate-wmapro-5.1: REF = $(SAMPLES)/wmapro/latin_192_mulitchannel_cut.pcm +fate-wmapro-5.1: CMD = pcm -i $(TARGET_SAMPLES)/wmapro/latin_192_mulitchannel_cut.wma -frames 101 +fate-wmapro-5.1: REF = $(SAMPLES)/wmapro/latin_192_mulitchannel_cut_v2.pcm FATE_WMAPRO-$(call DEMDEC, MOV, WMAPRO) += fate-wmapro-ism fate-wmapro-ism: CMD = pcm -i $(TARGET_SAMPLES)/isom/vc1-wmapro.ism -vn |