diff options
author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-01-31 13:24:50 +0000 |
---|---|---|
committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-01-31 13:29:04 +0000 |
commit | c86ecdf3f7b0c78ebfea23989b1a5d34885e119f (patch) | |
tree | c6606f19af814132b8cffa12fc3f5d9d2dc2cb9e /libavcodec/avcodec.h | |
parent | 899e19f1776c607c126b291a7e0a614782f18f42 (diff) | |
parent | 243df1351d2d928caa084a5704ed783f0b83f072 (diff) |
Merge commit '243df1351d2d928caa084a5704ed783f0b83f072'
* commit '243df1351d2d928caa084a5704ed783f0b83f072':
lavc: Move {min,max}_prediction_order to codec private options
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'libavcodec/avcodec.h')
-rw-r--r-- | libavcodec/avcodec.h | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 07b7e54216..3dd4c4c3fb 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -2621,19 +2621,15 @@ typedef struct AVCodecContext { */ int trellis; - /** - * - encoding: Set by user. - * - decoding: unused - */ +#if FF_API_PRIVATE_OPT + /** @deprecated use encoder private options instead */ + attribute_deprecated int min_prediction_order; - /** - * - encoding: Set by user. - * - decoding: unused - */ + /** @deprecated use encoder private options instead */ + attribute_deprecated int max_prediction_order; -#if FF_API_PRIVATE_OPT /** @deprecated use encoder private options instead */ attribute_deprecated int64_t timecode_frame_start; |