From 2862b63783b5556f7f3fb2d097629bc6879f833a Mon Sep 17 00:00:00 2001 From: Vittorio Giovara Date: Mon, 9 Nov 2015 03:15:06 +0100 Subject: lavc: Move prediction_method to codec private options This options is only used by huffyuv, ffvhuv, jpegls, mjpeg, mpegvideoenc, png, utvideo. It is a very codec-specific options, so deprecate the global variant. Set proper limits to the maximum allowed values, and update utvideoenc tests to use the new option name. Signed-off-by: Vittorio Giovara --- tests/fate/utvideo.mak | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'tests') diff --git a/tests/fate/utvideo.mak b/tests/fate/utvideo.mak index e1ef7ecbd6..4c0c6bf460 100644 --- a/tests/fate/utvideo.mak +++ b/tests/fate/utvideo.mak @@ -37,7 +37,7 @@ FATE_UTVIDEOENC += fate-utvideoenc_rgba_median fate-utvideoenc_rgba_median: OPTS = -pix_fmt rgba -pred median FATE_UTVIDEOENC += fate-utvideoenc_rgba_none -fate-utvideoenc_rgba_none: OPTS = -pix_fmt rgba -pred 3 +fate-utvideoenc_rgba_none: OPTS = -pix_fmt rgba -pred none FATE_UTVIDEOENC += fate-utvideoenc_rgb_left fate-utvideoenc_rgb_left: OPTS = -pix_fmt rgb24 -pred left @@ -46,7 +46,7 @@ FATE_UTVIDEOENC += fate-utvideoenc_rgb_median fate-utvideoenc_rgb_median: OPTS = -pix_fmt rgb24 -pred median FATE_UTVIDEOENC += fate-utvideoenc_rgb_none -fate-utvideoenc_rgb_none: OPTS = -pix_fmt rgb24 -pred 3 +fate-utvideoenc_rgb_none: OPTS = -pix_fmt rgb24 -pred none FATE_UTVIDEOENC += fate-utvideoenc_yuv420_left fate-utvideoenc_yuv420_left: OPTS = -pix_fmt yuv420p -pred left @@ -55,7 +55,7 @@ FATE_UTVIDEOENC += fate-utvideoenc_yuv420_median fate-utvideoenc_yuv420_median: OPTS = -pix_fmt yuv420p -pred median FATE_UTVIDEOENC += fate-utvideoenc_yuv420_none -fate-utvideoenc_yuv420_none: OPTS = -pix_fmt yuv420p -pred 3 +fate-utvideoenc_yuv420_none: OPTS = -pix_fmt yuv420p -pred none FATE_UTVIDEOENC += fate-utvideoenc_yuv422_left fate-utvideoenc_yuv422_left: OPTS = -pix_fmt yuv422p -pred left @@ -64,7 +64,7 @@ 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_yuv422_none: OPTS = -pix_fmt yuv422p -pred none $(FATE_UTVIDEOENC): $(VREF) -- cgit v1.2.3