diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-19 22:55:21 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-19 22:55:21 +0200 |
| commit | 4cb59ad84b97e50549f22998b2a83d0a1e7f4b97 (patch) | |
| tree | 72b9f769556432e2c39336f152e0975f8e3b8965 /tests/fate/video.mak | |
| parent | f4b05cd8415ad6160900bb00565f9b75e356530e (diff) | |
| parent | 3eec1d41b4a947ba497f528e68da14a8befb85b9 (diff) | |
| download | ffmpeg-4cb59ad84b97e50549f22998b2a83d0a1e7f4b97.tar.gz | |
Merge commit '3eec1d41b4a947ba497f528e68da14a8befb85b9'
* commit '3eec1d41b4a947ba497f528e68da14a8befb85b9':
fate: Reuse VREF and AREF variables where appropriate
Conflicts:
tests/fate/filter.mak
tests/fate/video.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/fate/video.mak')
| -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 6090074e96..50c29c4707 100644 --- a/tests/fate/video.mak +++ b/tests/fate/video.mak @@ -254,7 +254,7 @@ FATE_VIDEO-$(call DEMDEC, MOV, V410) += fate-v410dec fate-v410dec: CMD = framecrc -i $(SAMPLES)/v410/lenav410.mov -pix_fmt yuv444p10le FATE_VIDEO-$(call ENCDEC, V410 PGMYUV, AVI IMAGE2) += fate-v410enc -fate-v410enc: tests/vsynth1/00.pgm +fate-v410enc: $(VREF) fate-v410enc: CMD = md5 -f image2 -vcodec pgmyuv -i $(TARGET_PATH)/tests/vsynth1/%02d.pgm -flags +bitexact -vcodec v410 -f avi FATE_VIDEO-$(call DEMDEC, SIFF, VB) += fate-vb |