Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-06-11 05:10:21 +0400
committerMichael Niedermayer <michaelni@gmx.at>2014-06-11 05:10:21 +0400
commitb2fb65cbebba73894a6b98cfa877fddd45f6d124 (patch)
tree09e48bb2c6d7ec4c28d59e03eaab2510d9043e05 /tests/fate
parentb3a647d9ce59cd75ccf4233eac871af91bebf0d0 (diff)
parent641e57230b460bef52c88e61087d97c223910bea (diff)
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')
-rw-r--r--tests/fate/audio.mak3
1 files changed, 3 insertions, 0 deletions
diff --git a/tests/fate/audio.mak b/tests/fate/audio.mak
index aac0e9210a..aa58dfc15e 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