diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-06-11 03:10:21 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-11 03:10:21 +0200 |
| commit | b2fb65cbebba73894a6b98cfa877fddd45f6d124 (patch) | |
| tree | 09e48bb2c6d7ec4c28d59e03eaab2510d9043e05 /tests/fate/audio.mak | |
| parent | b3a647d9ce59cd75ccf4233eac871af91bebf0d0 (diff) | |
| parent | 641e57230b460bef52c88e61087d97c223910bea (diff) | |
| download | ffmpeg-streaming-b2fb65cbebba73894a6b98cfa877fddd45f6d124.zip ffmpeg-streaming-b2fb65cbebba73894a6b98cfa877fddd45f6d124.tar.gz | |
Merge commit '641e57230b460bef52c88e61087d97c223910bea'
* commit '641e57230b460bef52c88e61087d97c223910bea':
fate: add on2avc audio test
Conflicts:
tests/fate/audio.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/fate/audio.mak')
| -rw-r--r-- | tests/fate/audio.mak | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/tests/fate/audio.mak b/tests/fate/audio.mak index aac0e92..aa58dfc 100644 --- a/tests/fate/audio.mak +++ b/tests/fate/audio.mak @@ -48,6 +48,9 @@ fate-nellymoser-aref-encode: CMP_SHIFT = -244 fate-nellymoser-aref-encode: CMP_TARGET = 9612 fate-nellymoser-aref-encode: SIZE_TOLERANCE = 268 +FATE_SAMPLES_AUDIO-$(call DEMDEC, AVI, ON2AVC) += fate-on2avc +fate-on2avc: CMD = framecrc -i $(TARGET_SAMPLES)/vp7/potter-40.vp7 -frames 30 -vn + FATE_SAMPLES_AUDIO-$(call DEMDEC, PAF, PAF_AUDIO) += fate-paf-audio fate-paf-audio: CMD = framecrc -i $(TARGET_SAMPLES)/paf/hod1-partial.paf -vn |
