diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-13 13:42:10 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-13 13:42:10 +0100 |
| commit | 841a288cb32785400261cbab959fcfb982d3f699 (patch) | |
| tree | 5cdac1ec2a527409495aadfb6d9142b89b398d8b /tests/fate/utvideo.mak | |
| parent | a6e4796fbf0aa9b13451a8ef917ecc4e80d1d272 (diff) | |
| parent | 4d3b144c5ea824193019019d33740a1ae9e0bb69 (diff) | |
| download | ffmpeg-streaming-841a288cb32785400261cbab959fcfb982d3f699.zip ffmpeg-streaming-841a288cb32785400261cbab959fcfb982d3f699.tar.gz | |
Merge commit '4d3b144c5ea824193019019d33740a1ae9e0bb69'
* commit '4d3b144c5ea824193019019d33740a1ae9e0bb69':
fate: cosmetics: Order some test entries
Conflicts:
tests/fate/lossless-video.mak
tests/fate/microsoft.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/fate/utvideo.mak')
| -rw-r--r-- | tests/fate/utvideo.mak | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/tests/fate/utvideo.mak b/tests/fate/utvideo.mak index 44e0314..c6ce217 100644 --- a/tests/fate/utvideo.mak +++ b/tests/fate/utvideo.mak @@ -1,3 +1,9 @@ +FATE_UTVIDEO += fate-utvideo_rgb_left +fate-utvideo_rgb_left: CMD = framecrc -i $(SAMPLES)/utvideo/utvideo_rgb_left.avi + +FATE_UTVIDEO += fate-utvideo_rgb_median +fate-utvideo_rgb_median: CMD = framecrc -i $(SAMPLES)/utvideo/utvideo_rgb_median.avi + FATE_UTVIDEO += fate-utvideo_rgba_left fate-utvideo_rgba_left: CMD = framecrc -i $(SAMPLES)/utvideo/utvideo_rgba_left.avi @@ -7,12 +13,6 @@ fate-utvideo_rgba_median: CMD = framecrc -i $(SAMPLES)/utvideo/utvideo_rgba_medi FATE_UTVIDEO += fate-utvideo_rgba_single_symbol fate-utvideo_rgba_single_symbol: CMD = framecrc -i $(SAMPLES)/utvideo/utvideo_rgba_single_symbol.avi -FATE_UTVIDEO += fate-utvideo_rgb_left -fate-utvideo_rgb_left: CMD = framecrc -i $(SAMPLES)/utvideo/utvideo_rgb_left.avi - -FATE_UTVIDEO += fate-utvideo_rgb_median -fate-utvideo_rgb_median: CMD = framecrc -i $(SAMPLES)/utvideo/utvideo_rgb_median.avi - FATE_UTVIDEO += fate-utvideo_yuv420_left fate-utvideo_yuv420_left: CMD = framecrc -i $(SAMPLES)/utvideo/utvideo_yuv420_left.avi @@ -30,17 +30,14 @@ 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} -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_rgba_none +fate-utvideoenc_rgba_none: OPTS = -pix_fmt rgba -pred 3 FATE_UTVIDEOENC += fate-utvideoenc_rgb_left fate-utvideoenc_rgb_left: OPTS = -pix_fmt rgb24 -pred left @@ -48,8 +45,8 @@ 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_rgb_none +fate-utvideoenc_rgb_none: OPTS = -pix_fmt rgb24 -pred 3 FATE_UTVIDEOENC += fate-utvideoenc_yuv420_left fate-utvideoenc_yuv420_left: OPTS = -pix_fmt yuv420p -pred left @@ -57,8 +54,8 @@ 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_yuv420_none +fate-utvideoenc_yuv420_none: OPTS = -pix_fmt yuv420p -pred 3 FATE_UTVIDEOENC += fate-utvideoenc_yuv422_left fate-utvideoenc_yuv422_left: OPTS = -pix_fmt yuv422p -pred left @@ -66,6 +63,9 @@ 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_UTVIDEOENC += fate-utvideoenc_yuv422_none +fate-utvideoenc_yuv422_none: OPTS = -pix_fmt yuv422p -pred 3 + $(FATE_UTVIDEOENC): tests/vsynth1/00.pgm FATE_AVCONV-$(call ENCMUX, UTVIDEO, AVI) += $(FATE_UTVIDEOENC) |
