diff options
author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-01-28 15:24:00 +0000 |
---|---|---|
committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-01-28 15:24:00 +0000 |
commit | 30c1bdb87ce336f2b9957769e30a10d72f93d372 (patch) | |
tree | e951a9601f2c36e424ec023e9b9fab9b843f8237 /libavcodec/options_table.h | |
parent | 7c6e86c0cec17dfc020d58c82f4f1af5fcaea6c1 (diff) | |
parent | 7c79587d7407dab4b9445d66b5f111fe657c8c4d (diff) | |
download | ffmpeg-30c1bdb87ce336f2b9957769e30a10d72f93d372.tar.gz |
Merge commit '7c79587d7407dab4b9445d66b5f111fe657c8c4d'
* commit '7c79587d7407dab4b9445d66b5f111fe657c8c4d':
lavc: Move scenechange_threshold 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 5e8fb21c56..a7d3796f50 100644 --- a/libavcodec/options_table.h +++ b/libavcodec/options_table.h @@ -337,7 +337,9 @@ static const AVOption avcodec_options[] = { #if FF_API_STREAM_CODEC_TAG {"stream_codec_tag", NULL, OFFSET(stream_codec_tag), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX}, #endif +#if FF_API_PRIVATE_OPT {"sc_threshold", "scene change threshold", OFFSET(scenechange_threshold), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|E}, +#endif #if FF_API_MPV_OPT {"lmin", "deprecated, use encoder private options instead", OFFSET(lmin), AV_OPT_TYPE_INT, {.i64 = 0 }, 0, INT_MAX, V|E}, {"lmax", "deprecated, use encoder private options instead", OFFSET(lmax), AV_OPT_TYPE_INT, {.i64 = 0 }, 0, INT_MAX, V|E}, |