diff options
author | James Almer <jamrial@gmail.com> | 2017-10-03 21:28:07 -0300 |
---|---|---|
committer | James Almer <jamrial@gmail.com> | 2017-10-03 21:28:07 -0300 |
commit | a2b0602cdad8da62c137f7db07b608d6bbbcefaa (patch) | |
tree | 67220614b5797dc9bd6ea58244a1a2e1e2e3197b /tests/fate/utvideo.mak | |
parent | 08c751309670854c73b58f234a83f4ba679370be (diff) | |
parent | 4141a5a240fba44b4b4a1c488c279d7dd8a11ec7 (diff) | |
download | ffmpeg-a2b0602cdad8da62c137f7db07b608d6bbbcefaa.tar.gz |
Merge commit '4141a5a240fba44b4b4a1c488c279d7dd8a11ec7'
* commit '4141a5a240fba44b4b4a1c488c279d7dd8a11ec7':
Use modern avconv syntax for codec selection in documentation and tests
Merged-by: James Almer <jamrial@gmail.com>
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 1acef9ae3e..2cf06b36f5 100644 --- a/tests/fate/utvideo.mak +++ b/tests/fate/utvideo.mak @@ -28,7 +28,7 @@ fate-utvideo_yuv422_median: CMD = framecrc -i $(TARGET_SAMPLES)/utvideo/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 -slices 1 -sws_flags +accurate_rnd+bitexact ${OPTS} +fate-utvideoenc%: CMD = framemd5 -f image2 -c:v pgmyuv -i $(TARGET_PATH)/tests/vsynth1/%02d.pgm -c:v utvideo -slices 1 -sws_flags +accurate_rnd+bitexact ${OPTS} FATE_UTVIDEOENC += fate-utvideoenc_rgba_left fate-utvideoenc_rgba_left: OPTS = -pix_fmt rgba -pred left |