diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-01-28 15:08:10 +0000 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-01-28 15:08:10 +0000 |
| commit | 13be46c08e59141408f1a7afd4737826afa87f11 (patch) | |
| tree | 83466267710058994b498df467287a2d74a72e55 /libavcodec/options_table.h | |
| parent | 4f32ccb61800ef1a0acf02010784da4f15adde44 (diff) | |
| parent | 0ac9f33a9e69c64eee592791be3c5441a6a3d6b7 (diff) | |
Merge commit '0ac9f33a9e69c64eee592791be3c5441a6a3d6b7'
* commit '0ac9f33a9e69c64eee592791be3c5441a6a3d6b7':
lavc: Move frame_skip_* 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 b3edbe249e..c52c640c35 100644 --- a/libavcodec/options_table.h +++ b/libavcodec/options_table.h @@ -382,10 +382,12 @@ static const AVOption avcodec_options[] = { {"level", NULL, OFFSET(level), AV_OPT_TYPE_INT, {.i64 = FF_LEVEL_UNKNOWN }, INT_MIN, INT_MAX, V|A|E, "level"}, {"unknown", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_LEVEL_UNKNOWN }, INT_MIN, INT_MAX, V|A|E, "level"}, {"lowres", "decode at 1= 1/2, 2=1/4, 3=1/8 resolutions", OFFSET(lowres), AV_OPT_TYPE_INT, {.i64 = 0 }, 0, INT_MAX, V|A|D}, +#if FF_API_PRIVATE_OPT {"skip_threshold", "frame skip threshold", OFFSET(frame_skip_threshold), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|E}, {"skip_factor", "frame skip factor", OFFSET(frame_skip_factor), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|E}, {"skip_exp", "frame skip exponent", OFFSET(frame_skip_exp), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|E}, {"skipcmp", "frame skip compare function", OFFSET(frame_skip_cmp), AV_OPT_TYPE_INT, {.i64 = FF_CMP_DCTMAX }, INT_MIN, INT_MAX, V|E, "cmp_func"}, +#endif #if FF_API_MPV_OPT {"border_mask", "deprecated, use encoder private options instead", OFFSET(border_masking), AV_OPT_TYPE_FLOAT, {.dbl = DEFAULT }, -FLT_MAX, FLT_MAX, V|E}, #endif |