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/options_table.h | |
| parent | 0e3e3656d31a7e1e595ccb5ca3acfc76a23d785e (diff) | |
| parent | 96c373c7704aeb1cc1d2c275fbb5d71777665589 (diff) | |
| download | ffmpeg-5b0d4c247a3c3ba8a8ece70b31354121645c8320.tar.gz | |
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/options_table.h')
| -rw-r--r-- | libavcodec/options_table.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/options_table.h b/libavcodec/options_table.h index 7c408052eb..ddd800036c 100644 --- a/libavcodec/options_table.h +++ b/libavcodec/options_table.h @@ -327,7 +327,9 @@ static const AVOption avcodec_options[] = { {"deflate", "deflate-based coder", 0, AV_OPT_TYPE_CONST, {.i64 = FF_CODER_TYPE_DEFLATE }, INT_MIN, INT_MAX, V|E, "coder"}, #endif /* FF_API_UNUSED_MEMBERS */ #endif /* FF_API_CODER_TYPE */ +#if FF_API_PRIVATE_OPT {"context", "context model", OFFSET(context_model), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|E}, +#endif {"slice_flags", NULL, OFFSET(slice_flags), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX}, #if FF_API_XVMC {"xvmc_acceleration", NULL, OFFSET(xvmc_acceleration), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX}, |