diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2012-08-20 17:15:15 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2012-08-20 17:31:55 +0200 |
commit | bb3ed3bae6a9e6e2dbe8deeb45088453f214b770 (patch) | |
tree | 2cb536f24abb5d9cfc275848da43d93d4302d0d2 /tests/fate/utvideo.mak | |
parent | aee51039ee204197fdb4c924f8ee433b803ab1e1 (diff) | |
parent | b96509c93ce6ebb0e997e0b2a55cf10c786a2812 (diff) | |
download | ffmpeg-bb3ed3bae6a9e6e2dbe8deeb45088453f214b770.tar.gz |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
fate: Add FATE tests for the Ut Video encoder
lavc: add Ut Video encoder
mpegvideo_enc: remove stray duplicate line from 7f9aaa4
swscale: x86: fix #endif comments in rgb2rgb template file
avconv: mark more options as expert.
avconv: split printing "main options" into global and per-file.
avconv: refactor help printing.
Conflicts:
Changelog
ffmpeg_opt.c
ffserver.c
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/fate/utvideo.mak')
-rw-r--r-- | tests/fate/utvideo.mak | 42 |
1 files changed, 42 insertions, 0 deletions
diff --git a/tests/fate/utvideo.mak b/tests/fate/utvideo.mak index 4e350f722e..991072ef47 100644 --- a/tests/fate/utvideo.mak +++ b/tests/fate/utvideo.mak @@ -24,3 +24,45 @@ fate-utvideo_yuv422_median: CMD = framecrc -i $(SAMPLES)/utvideo/utvideo_yuv422_ FATE_SAMPLES_AVCONV += $(FATE_UTVIDEO) fate-utvideo: $(FATE_UTVIDEO) + +fate-utvideoenc%: CMD = framemd5 -f image2 -vcodec pgmyuv -i $(TARGET_PATH)/tests/vsynth1/%02d.pgm -vcodec utvideo -f avi ${OPTS} +fate-utvideoenc%: tests/vsynth1/00.pgm + +FATE_UTVIDEOENC += fate-utvideoenc_rgba_none +fate-utvideoenc_rgba_none: OPTS = -pix_fmt rgba -pred 3 + +FATE_UTVIDEOENC += fate-utvideoenc_rgba_left +fate-utvideoenc_rgba_left: OPTS = -pix_fmt rgba -pred left + +FATE_UTVIDEOENC += fate-utvideoenc_rgba_median +fate-utvideoenc_rgba_median: OPTS = -pix_fmt rgba -pred median + +FATE_UTVIDEOENC += fate-utvideoenc_rgb_none +fate-utvideoenc_rgb_none: OPTS = -pix_fmt rgb24 -pred 3 + +FATE_UTVIDEOENC += fate-utvideoenc_rgb_left +fate-utvideoenc_rgb_left: OPTS = -pix_fmt rgb24 -pred left + +FATE_UTVIDEOENC += fate-utvideoenc_rgb_median +fate-utvideoenc_rgb_median: OPTS = -pix_fmt rgb24 -pred median + +FATE_UTVIDEOENC += fate-utvideoenc_yuv420_none +fate-utvideoenc_yuv420_none: OPTS = -pix_fmt yuv420p -pred 3 + +FATE_UTVIDEOENC += fate-utvideoenc_yuv420_left +fate-utvideoenc_yuv420_left: OPTS = -pix_fmt yuv420p -pred left + +FATE_UTVIDEOENC += fate-utvideoenc_yuv420_median +fate-utvideoenc_yuv420_median: OPTS = -pix_fmt yuv420p -pred median + +FATE_UTVIDEOENC += fate-utvideoenc_yuv422_none +fate-utvideoenc_yuv422_none: OPTS = -pix_fmt yuv422p -pred 3 + +FATE_UTVIDEOENC += fate-utvideoenc_yuv422_left +fate-utvideoenc_yuv422_left: OPTS = -pix_fmt yuv422p -pred left + +FATE_UTVIDEOENC += fate-utvideoenc_yuv422_median +fate-utvideoenc_yuv422_median: OPTS = -pix_fmt yuv422p -pred median + +FATE_AVCONV += $(FATE_UTVIDEOENC) +fate-utvideoenc: $(FATE_UTVIDEOENC) |