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/options_table.h | |
| parent | 899e19f1776c607c126b291a7e0a614782f18f42 (diff) | |
| parent | 243df1351d2d928caa084a5704ed783f0b83f072 (diff) | |
| download | ffmpeg-c86ecdf3f7b0c78ebfea23989b1a5d34885e119f.tar.gz | |
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/options_table.h')
| -rw-r--r-- | libavcodec/options_table.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/options_table.h b/libavcodec/options_table.h index a1ad72a291..efe6d3c919 100644 --- a/libavcodec/options_table.h +++ b/libavcodec/options_table.h @@ -430,9 +430,9 @@ static const AVOption avcodec_options[] = { {"b_sensitivity", "adjust sensitivity of b_frame_strategy 1", OFFSET(b_sensitivity), AV_OPT_TYPE_INT, {.i64 = 40 }, 1, INT_MAX, V|E}, #endif {"compression_level", NULL, OFFSET(compression_level), AV_OPT_TYPE_INT, {.i64 = FF_COMPRESSION_DEFAULT }, INT_MIN, INT_MAX, V|A|E}, +#if FF_API_PRIVATE_OPT {"min_prediction_order", NULL, OFFSET(min_prediction_order), AV_OPT_TYPE_INT, {.i64 = -1 }, INT_MIN, INT_MAX, A|E}, {"max_prediction_order", NULL, OFFSET(max_prediction_order), AV_OPT_TYPE_INT, {.i64 = -1 }, INT_MIN, INT_MAX, A|E}, -#if FF_API_PRIVATE_OPT {"timecode_frame_start", "GOP timecode frame start number, in non-drop-frame format", OFFSET(timecode_frame_start), AV_OPT_TYPE_INT64, {.i64 = -1 }, -1, INT64_MAX, V|E}, #endif {"bits_per_raw_sample", NULL, OFFSET(bits_per_raw_sample), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX}, |