summaryrefslogtreecommitdiff
path: root/libavcodec/utvideo.c
diff options
context:
space:
mode:
authorVittorio Giovara <vittorio.giovara@gmail.com>2015-11-09 03:15:06 +0100
committerVittorio Giovara <vittorio.giovara@gmail.com>2016-01-21 15:33:19 -0500
commit2862b63783b5556f7f3fb2d097629bc6879f833a (patch)
tree990909a954f2ce1a6cd5ed5f7e94c305426b5b66 /libavcodec/utvideo.c
parent243df1351d2d928caa084a5704ed783f0b83f072 (diff)
downloadffmpeg-2862b63783b5556f7f3fb2d097629bc6879f833a.tar.gz
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 <vittorio.giovara@gmail.com>
Diffstat (limited to 'libavcodec/utvideo.c')
-rw-r--r--libavcodec/utvideo.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/utvideo.c b/libavcodec/utvideo.c
index eb5a924222..35e927ca2d 100644
--- a/libavcodec/utvideo.c
+++ b/libavcodec/utvideo.c
@@ -26,9 +26,11 @@
#include "utvideo.h"
+#if FF_API_PRIVATE_OPT
const int ff_ut_pred_order[5] = {
PRED_LEFT, PRED_MEDIAN, PRED_MEDIAN, PRED_NONE, PRED_GRADIENT
};
+#endif
const int ff_ut_rgb_order[4] = { 1, 2, 0, 3 }; // G, B, R, A