aboutsummaryrefslogtreecommitdiffstats
path: root/tests/fate/video.mak
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-03-03 20:54:17 +0100
committerMichael Niedermayer <michaelni@gmx.at>2015-03-03 21:03:58 +0100
commitb7d3fbc69bb60ab2c1369ac5ba20f23565a4db8d (patch)
tree2dc3dff697c834df2385c8542f62f6f2d23c8fc3 /tests/fate/video.mak
parent75dbe4c1fa2c81b2c5cf6436295a143bdecb9e70 (diff)
parent994d8f3095180ba1b2c6040a97718e931a782b34 (diff)
downloadffmpeg-b7d3fbc69bb60ab2c1369ac5ba20f23565a4db8d.tar.gz
Merge commit '994d8f3095180ba1b2c6040a97718e931a782b34'
* commit '994d8f3095180ba1b2c6040a97718e931a782b34': fate: Add AIC test with odd sizes Conflicts: tests/fate/video.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/fate/video.mak')
-rw-r--r--tests/fate/video.mak3
1 files changed, 3 insertions, 0 deletions
diff --git a/tests/fate/video.mak b/tests/fate/video.mak
index be1fe00655..71220c8baa 100644
--- a/tests/fate/video.mak
+++ b/tests/fate/video.mak
@@ -13,6 +13,9 @@ fate-aasc: CMD = framecrc -i $(TARGET_SAMPLES)/aasc/AASC-1.5MB.AVI -pix_fmt rgb2
FATE_VIDEO-$(call DEMDEC, MOV, AIC) += fate-aic
fate-aic: CMD = framecrc -idct simple -i $(TARGET_SAMPLES)/aic/small_apple_intermediate_codec.mov -an -vframes 15
+FATE_VIDEO-$(call DEMDEC, MOV, AIC) += fate-aic-oddsize
+fate-aic-oddsize: CMD = framecrc -i $(TARGET_SAMPLES)/aic/aic_odd_dimensions.mov
+
FATE_VIDEO-$(call DEMDEC, MM, MMVIDEO) += fate-alg-mm
fate-alg-mm: CMD = framecrc -i $(TARGET_SAMPLES)/alg-mm/ibmlogo.mm -an -pix_fmt rgb24