diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-11-29 13:29:26 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-11-29 13:35:56 +0100 |
| commit | 7dc0ed80e877a16a11ba45d747723d88e8a92cd8 (patch) | |
| tree | b1842c70bb437b14e16ca833443615a2a267c2b8 /tests/fate/utvideo.mak | |
| parent | a7eabbb20dc077d7380f874b9c35fffa478186a6 (diff) | |
| parent | 1f3f896564501c23b44fcf605567c78ce066b539 (diff) | |
| download | ffmpeg-7dc0ed80e877a16a11ba45d747723d88e8a92cd8.tar.gz | |
Merge commit '1f3f896564501c23b44fcf605567c78ce066b539'
* commit '1f3f896564501c23b44fcf605567c78ce066b539':
fate: Add dependencies for Vorbis, ProRes, QTRLE, utvideo tests
fate: real: Add dependencies
fate: lossless-audio: Add dependencies
x86: h264dsp: Fix linking with yasm and optimizations disabled
Conflicts:
libavcodec/x86/h264dsp_init.c
tests/fate/lossless-audio.mak
tests/fate/real.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/fate/utvideo.mak')
| -rw-r--r-- | tests/fate/utvideo.mak | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/fate/utvideo.mak b/tests/fate/utvideo.mak index 184a3bea98..44e03144ce 100644 --- a/tests/fate/utvideo.mak +++ b/tests/fate/utvideo.mak @@ -25,7 +25,7 @@ fate-utvideo_yuv422_left: CMD = framecrc -i $(SAMPLES)/utvideo/utvideo_yuv422_le FATE_UTVIDEO += fate-utvideo_yuv422_median fate-utvideo_yuv422_median: CMD = framecrc -i $(SAMPLES)/utvideo/utvideo_yuv422_median.avi -FATE_SAMPLES_AVCONV += $(FATE_UTVIDEO) +FATE_SAMPLES_AVCONV-$(call DEMDEC, AVI, UTVIDEO) += $(FATE_UTVIDEO) fate-utvideo: $(FATE_UTVIDEO) fate-utvideoenc%: CMD = framemd5 -f image2 -vcodec pgmyuv -i $(TARGET_PATH)/tests/vsynth1/%02d.pgm -vcodec utvideo -sws_flags +accurate_rnd+bitexact ${OPTS} @@ -68,5 +68,5 @@ fate-utvideoenc_yuv422_median: OPTS = -pix_fmt yuv422p -pred median $(FATE_UTVIDEOENC): tests/vsynth1/00.pgm -FATE_AVCONV += $(FATE_UTVIDEOENC) +FATE_AVCONV-$(call ENCMUX, UTVIDEO, AVI) += $(FATE_UTVIDEOENC) fate-utvideoenc: $(FATE_UTVIDEOENC) |