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/utvideo.mak | |
| parent | f4b05cd8415ad6160900bb00565f9b75e356530e (diff) | |
| parent | 3eec1d41b4a947ba497f528e68da14a8befb85b9 (diff) | |
| download | ffmpeg-streaming-4cb59ad84b97e50549f22998b2a83d0a1e7f4b97.zip ffmpeg-streaming-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/utvideo.mak')
| -rw-r--r-- | tests/fate/utvideo.mak | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/fate/utvideo.mak b/tests/fate/utvideo.mak index c6ce217..64d3896 100644 --- a/tests/fate/utvideo.mak +++ b/tests/fate/utvideo.mak @@ -66,7 +66,7 @@ fate-utvideoenc_yuv422_median: OPTS = -pix_fmt yuv422p -pred median FATE_UTVIDEOENC += fate-utvideoenc_yuv422_none fate-utvideoenc_yuv422_none: OPTS = -pix_fmt yuv422p -pred 3 -$(FATE_UTVIDEOENC): tests/vsynth1/00.pgm +$(FATE_UTVIDEOENC): $(VREF) FATE_AVCONV-$(call ENCMUX, UTVIDEO, AVI) += $(FATE_UTVIDEOENC) fate-utvideoenc: $(FATE_UTVIDEOENC) |
