From 96c373c7704aeb1cc1d2c275fbb5d71777665589 Mon Sep 17 00:00:00 2001 From: Vittorio Giovara Date: Sun, 13 Sep 2015 23:45:24 +0200 Subject: lavc: Move context_model to codec private options This option is only used by ffv1 and ffvhuff. It is a very codec-specific option, so deprecate the global variant. Improve documentation a little. Signed-off-by: Vittorio Giovara --- libavcodec/avcodec.h | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'libavcodec/avcodec.h') diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index fab554cd7a..695f5349d7 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -2341,12 +2341,11 @@ typedef struct AVCodecContext { int coder_type; #endif /* FF_API_CODER_TYPE */ - /** - * context model - * - encoding: Set by user. - * - decoding: unused - */ +#if FF_API_PRIVATE_OPT + /** @deprecated use encoder private options instead */ + attribute_deprecated int context_model; +#endif #if FF_API_MPV_OPT /** -- cgit v1.2.3