diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-06-28 11:41:23 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-06-28 11:41:23 +0200 |
| commit | fb2eeebf662ef3f3b0600da8471b3ff120afb652 (patch) | |
| tree | 3908430f44c91607240e9a0985bec2261dc4a813 /tests/fate/lossless-audio.mak | |
| parent | f9883a669c3df05a5c453428e080298c6511a17e (diff) | |
| parent | d3ea79e8a65ddad4da11813bb43c46701295f68c (diff) | |
| download | ffmpeg-streaming-fb2eeebf662ef3f3b0600da8471b3ff120afb652.zip ffmpeg-streaming-fb2eeebf662ef3f3b0600da8471b3ff120afb652.tar.gz | |
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>
Diffstat (limited to 'tests/fate/lossless-audio.mak')
| -rw-r--r-- | tests/fate/lossless-audio.mak | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/fate/lossless-audio.mak b/tests/fate/lossless-audio.mak index 1d278da..58641ab 100644 --- a/tests/fate/lossless-audio.mak +++ b/tests/fate/lossless-audio.mak @@ -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) |
