diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-01-27 20:18:04 +0000 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-01-27 20:18:04 +0000 |
| commit | 2e9b995e4f7f6457a36331e66fb78a5676cd9b25 (patch) | |
| tree | 1134c54348410c273ee9bf04101445ffbbc7cc39 /libavcodec/libxavs.c | |
| parent | 11e6f13a13302dae18a1a83dac72fd9df0a69139 (diff) | |
| parent | 0e6c8532215790bbe560a9eea4f3cc82bb55cf92 (diff) | |
| download | ffmpeg-2e9b995e4f7f6457a36331e66fb78a5676cd9b25.tar.gz | |
Merge commit '0e6c8532215790bbe560a9eea4f3cc82bb55cf92'
* commit '0e6c8532215790bbe560a9eea4f3cc82bb55cf92'
lavc: Move b_frame_strategy and b_sensitivity to codec private options
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'libavcodec/libxavs.c')
| -rw-r--r-- | libavcodec/libxavs.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/libavcodec/libxavs.c b/libavcodec/libxavs.c index 2f6c3261a6..767beb153e 100644 --- a/libavcodec/libxavs.c +++ b/libavcodec/libxavs.c @@ -56,6 +56,7 @@ typedef struct XavsContext { int motion_est; int mbtree; int mixed_refs; + int b_frame_strategy; int64_t *pts_buffer; int out_frame_count; @@ -309,7 +310,14 @@ FF_ENABLE_DEPRECATION_WARNINGS /* cabac is not included in AVS JiZhun Profile */ x4->params.b_cabac = 0; - x4->params.i_bframe_adaptive = avctx->b_frame_strategy; +#if FF_API_PRIVATE_OPT +FF_DISABLE_DEPRECATION_WARNINGS + if (avctx->b_frame_strategy) + x4->b_frame_strategy = avctx->b_frame_strategy; +FF_ENABLE_DEPRECATION_WARNINGS +#endif + + x4->params.i_bframe_adaptive = x4->b_frame_strategy; avctx->has_b_frames = !!avctx->max_b_frames; @@ -437,6 +445,7 @@ static const AVOption options[] = { { "umh", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = XAVS_ME_UMH }, INT_MIN, INT_MAX, VE, "motion-est" }, { "esa", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = XAVS_ME_ESA }, INT_MIN, INT_MAX, VE, "motion-est" }, { "tesa", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = XAVS_ME_TESA }, INT_MIN, INT_MAX, VE, "motion-est" }, + { "b_strategy", "Strategy to choose between I/P/B-frames", OFFSET(b_frame_strategy), AV_OPT_TYPE_INT, {.i64 = 0 }, 0, 2, VE}, { NULL }, }; |