diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-03-24 10:59:43 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-03-24 10:59:43 +0100 |
| commit | f58f75dd92a5d8b48e23865f6d4a69ce70d0bd1c (patch) | |
| tree | 1345408bddb30de183f5945cb3673262554f16bb /tests | |
| parent | b222c28ee885187c5fcded69d8fa98fe60c70a7e (diff) | |
| parent | cb7190cd2c691fd93e4d3664f3fce6c19ee001dd (diff) | |
| download | ffmpeg-f58f75dd92a5d8b48e23865f6d4a69ce70d0bd1c.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
rv34: error out on size changes with frame threading
aacsbr: Add a debug check to sbr_mapping.
aac: Reset some state variables when turning SBR off
aac: Reset PS parameters on header decode failure.
fate: add wmalossless test.
aacsbr: handle m_max values smaller than 4.
Conflicts:
libavcodec/aacsbr.c
tests/fate/lossless-audio.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/fate/lossless-audio.mak | 3 | ||||
| -rw-r--r-- | tests/ref/fate/lossless-wma | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/tests/fate/lossless-audio.mak b/tests/fate/lossless-audio.mak index 0c33671afa..c12f31ead7 100644 --- a/tests/fate/lossless-audio.mak +++ b/tests/fate/lossless-audio.mak @@ -13,6 +13,9 @@ fate-lossless-shorten: CMD = md5 -i $(SAMPLES)/lossless-audio/luckynight-partial FATE_LOSSLESS_AUDIO += fate-lossless-tta fate-lossless-tta: CMD = crc -i $(SAMPLES)/lossless-audio/inside.tta +FATE_LOSSLESS_AUDIO += fate-lossless-wma +fate-lossless-wma: CMD = md5 -i $(SAMPLES)/lossless-audio/luckynight-partial.wma -f s16le + FATE_TESTS += $(FATE_LOSSLESS_AUDIO) fate-lossless-audio: $(FATE_LOSSLESS_AUDIO) diff --git a/tests/ref/fate/lossless-wma b/tests/ref/fate/lossless-wma new file mode 100644 index 0000000000..5bea19b219 --- /dev/null +++ b/tests/ref/fate/lossless-wma @@ -0,0 +1 @@ +35dc840f91cbcece02178d03c8f2fe26 |