diff options
| author | Andreas Rheinhardt <andreas.rheinhardt@gmail.com> | 2021-02-25 19:20:01 +0100 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2021-04-27 10:43:02 -0300 |
| commit | d85c41b5723a4acf9400043cb533682d2e2c4287 (patch) | |
| tree | 9e55af93f5fd80b3f8136fe26f52c97387e4b6dc /libavcodec/libx264.c | |
| parent | e1597fe0cfe07e134ece8ea199ff520d3ac77aee (diff) | |
| download | ffmpeg-d85c41b5723a4acf9400043cb533682d2e2c4287.tar.gz | |
avcodec: Remove private options from AVCodecContext
Several options that were too codec-specific were deprecated between
0e6c8532215790bbe560a9eea4f3cc82bb55cf92 and
0e9c4fe254073b209970df3e3cb84531bc388e99.
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavcodec/libx264.c')
| -rw-r--r-- | libavcodec/libx264.c | 33 |
1 files changed, 0 insertions, 33 deletions
diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c index 6d945fc3fb..4e7097e569 100644 --- a/libavcodec/libx264.c +++ b/libavcodec/libx264.c @@ -680,12 +680,6 @@ static av_cold int X264_init(AVCodecContext *avctx) if (avctx->b_quant_factor > 0) x4->params.rc.f_pb_factor = avctx->b_quant_factor; -#if FF_API_PRIVATE_OPT -FF_DISABLE_DEPRECATION_WARNINGS - if (avctx->chromaoffset) - x4->chroma_offset = avctx->chromaoffset; -FF_ENABLE_DEPRECATION_WARNINGS -#endif if (x4->chroma_offset) x4->params.analyse.i_chroma_qp_offset = x4->chroma_offset; @@ -694,12 +688,6 @@ FF_ENABLE_DEPRECATION_WARNINGS if (avctx->max_b_frames >= 0) x4->params.i_bframe = avctx->max_b_frames; -#if FF_API_PRIVATE_OPT -FF_DISABLE_DEPRECATION_WARNINGS - if (avctx->scenechange_threshold >= 0) - x4->scenechange_threshold = avctx->scenechange_threshold; -FF_ENABLE_DEPRECATION_WARNINGS -#endif if (x4->scenechange_threshold >= 0) x4->params.i_scenecut_threshold = x4->scenechange_threshold; @@ -729,22 +717,10 @@ FF_ENABLE_DEPRECATION_WARNINGS x4->params.analyse.i_trellis = avctx->trellis; if (avctx->me_range >= 0) x4->params.analyse.i_me_range = avctx->me_range; -#if FF_API_PRIVATE_OPT - FF_DISABLE_DEPRECATION_WARNINGS - if (avctx->noise_reduction >= 0) - x4->noise_reduction = avctx->noise_reduction; - FF_ENABLE_DEPRECATION_WARNINGS -#endif if (x4->noise_reduction >= 0) x4->params.analyse.i_noise_reduction = x4->noise_reduction; if (avctx->me_subpel_quality >= 0) x4->params.analyse.i_subpel_refine = avctx->me_subpel_quality; -#if FF_API_PRIVATE_OPT -FF_DISABLE_DEPRECATION_WARNINGS - if (avctx->b_frame_strategy >= 0) - x4->b_frame_strategy = avctx->b_frame_strategy; -FF_ENABLE_DEPRECATION_WARNINGS -#endif if (avctx->keyint_min >= 0) x4->params.i_keyint_min = avctx->keyint_min; if (avctx->me_cmp >= 0) @@ -1155,18 +1131,9 @@ static const AVCodecDefault x264_defaults[] = { { "qcomp", "-1" }, // { "rc_lookahead", "-1" }, { "refs", "-1" }, -#if FF_API_PRIVATE_OPT - { "sc_threshold", "-1" }, -#endif { "trellis", "-1" }, -#if FF_API_PRIVATE_OPT - { "nr", "-1" }, -#endif { "me_range", "-1" }, { "subq", "-1" }, -#if FF_API_PRIVATE_OPT - { "b_strategy", "-1" }, -#endif { "keyint_min", "-1" }, { "cmp", "-1" }, { "threads", AV_STRINGIFY(X264_THREADS_AUTO) }, |