Browse Source

Merge commit 'd3ea79e8a65ddad4da11813bb43c46701295f68c'

* commit 'd3ea79e8a65ddad4da11813bb43c46701295f68c':
  FATE: drop the last truncated frame from the wma lossless test

Conflicts:
	tests/fate/lossless-audio.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
tags/n2.8
Michael Niedermayer 10 years ago
parent
commit
fb2eeebf66
2 changed files with 2 additions and 2 deletions
  1. +1
    -1
      tests/fate/lossless-audio.mak
  2. +1
    -1
      tests/ref/fate/lossless-wma

+ 1
- 1
tests/fate/lossless-audio.mak View File

@@ -26,7 +26,7 @@ FATE_SAMPLES_LOSSLESS_AUDIO-$(call DEMDEC, TTA, TTA) += fate-lossless-tta-encryp
fate-lossless-tta-encrypted: CMD = crc -password ffmpeg -i $(TARGET_SAMPLES)/lossless-audio/encrypted.tta

FATE_SAMPLES_LOSSLESS_AUDIO-$(call DEMDEC, ASF, WMALOSSLESS) += fate-lossless-wma
fate-lossless-wma: CMD = md5 -i $(TARGET_SAMPLES)/lossless-audio/luckynight-partial.wma -f s16le
fate-lossless-wma: CMD = md5 -i $(TARGET_SAMPLES)/lossless-audio/luckynight-partial.wma -f s16le -frames 209

FATE_SAMPLES_LOSSLESS_AUDIO += $(FATE_SAMPLES_LOSSLESS_AUDIO-yes)



+ 1
- 1
tests/ref/fate/lossless-wma View File

@@ -1 +1 @@
35dc840f91cbcece02178d03c8f2fe26
ab45f262b22030e908cb03f2cc8e89b5

Loading…
Cancel
Save