diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-01-28 16:54:26 +0000 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-01-28 16:57:04 +0000 |
| commit | 5b0d4c247a3c3ba8a8ece70b31354121645c8320 (patch) | |
| tree | 9fe83a0d04bff7be533c99a6774c3ecfd529e50c /libavcodec/avcodec.h | |
| parent | 0e3e3656d31a7e1e595ccb5ca3acfc76a23d785e (diff) | |
| parent | 96c373c7704aeb1cc1d2c275fbb5d71777665589 (diff) | |
Merge commit '96c373c7704aeb1cc1d2c275fbb5d71777665589'
* commit '96c373c7704aeb1cc1d2c275fbb5d71777665589':
lavc: Move context_model to codec private options
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'libavcodec/avcodec.h')
| -rw-r--r-- | libavcodec/avcodec.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 8ba8ea84ee..8fe9928ba3 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -2575,12 +2575,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 /** |