diff options
| author | James Almer <jamrial@gmail.com> | 2017-10-23 15:50:46 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-10-23 15:50:46 -0300 |
| commit | 400ecd8e4059e0d6c587915bca5e7e11858cca33 (patch) | |
| tree | 7155baeba3628fedf437a527c7faed947585e3da /libavcodec/options_table.h | |
| parent | 7bbe33b0526723f0a20c27e3b8d03b186b27fdf6 (diff) | |
| parent | 72dc7ddd18fe54ee68aec71590c3202ad009a8fc (diff) | |
| download | ffmpeg-400ecd8e4059e0d6c587915bca5e7e11858cca33.tar.gz | |
Merge commit '72dc7ddd18fe54ee68aec71590c3202ad009a8fc'
* commit '72dc7ddd18fe54ee68aec71590c3202ad009a8fc':
lavc: Drop deprecated error rate option
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavcodec/options_table.h')
| -rw-r--r-- | libavcodec/options_table.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/libavcodec/options_table.h b/libavcodec/options_table.h index 6e90c0d77c..68dce2a930 100644 --- a/libavcodec/options_table.h +++ b/libavcodec/options_table.h @@ -348,9 +348,6 @@ static const AVOption avcodec_options[] = { #endif {"rc_init_occupancy", "number of bits which should be loaded into the rc buffer before decoding starts", OFFSET(rc_initial_buffer_occupancy), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|E}, {"flags2", NULL, OFFSET(flags2), AV_OPT_TYPE_FLAGS, {.i64 = DEFAULT}, 0, UINT_MAX, V|A|E|D, "flags2"}, -#if FF_API_ERROR_RATE -{"error", NULL, OFFSET(error_rate), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|E}, -#endif {"threads", "set the number of threads", OFFSET(thread_count), AV_OPT_TYPE_INT, {.i64 = 1 }, 0, INT_MAX, V|A|E|D, "threads"}, {"auto", "autodetect a suitable number of threads to use", 0, AV_OPT_TYPE_CONST, {.i64 = 0 }, INT_MIN, INT_MAX, V|E|D, "threads"}, #if FF_API_MPV_OPT |