summaryrefslogtreecommitdiff
path: root/libavcodec/utvideo.c
diff options
context:
space:
mode:
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>2016-02-03 16:49:19 +0000
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>2016-02-03 16:49:19 +0000
commitf3af379b5c1816271b1afce0ccb2a935dc29940c (patch)
tree629aec01a415bfe4a0552d31292adbb01b31d180 /libavcodec/utvideo.c
parent908d010b12fadc36d8cadf6bba5e073e23b9603c (diff)
parent2862b63783b5556f7f3fb2d097629bc6879f833a (diff)
Merge commit '2862b63783b5556f7f3fb2d097629bc6879f833a'
* commit '2862b63783b5556f7f3fb2d097629bc6879f833a': lavc: Move prediction_method to codec private options Merged-by: Derek Buitenhuis <derek.buitenhuis@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 308adb75d9..b14e56e0d8 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