diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-04 19:05:28 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-04 19:05:28 +0100 |
| commit | 1c9f2ebdcd073a0f23c32c237182c4c81d91056a (patch) | |
| tree | 565e4064d0857c9c6b4609bdbd12513f9961f40a | |
| parent | ec5a4af560aafd67c80fe1c80af879d4c4cdaa63 (diff) | |
| parent | 62139b14e621f096d0f8ed90920d042b92867e40 (diff) | |
| download | ffmpeg-1c9f2ebdcd073a0f23c32c237182c4c81d91056a.tar.gz | |
Merge commit '62139b14e621f096d0f8ed90920d042b92867e40'
* commit '62139b14e621f096d0f8ed90920d042b92867e40':
fate: Specify the idct to use for the aic-oddsize test
Conflicts:
tests/fate/video.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | tests/fate/video.mak | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/fate/video.mak b/tests/fate/video.mak index 71220c8baa..08eae8642d 100644 --- a/tests/fate/video.mak +++ b/tests/fate/video.mak @@ -14,7 +14,7 @@ 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-aic-oddsize: CMD = framecrc -idct simple -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 |