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/flacenc.c | |
parent | e1597fe0cfe07e134ece8ea199ff520d3ac77aee (diff) |
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/flacenc.c')
-rw-r--r-- | libavcodec/flacenc.c | 36 |
1 files changed, 0 insertions, 36 deletions
diff --git a/libavcodec/flacenc.c b/libavcodec/flacenc.c index 38571ec9c9..9460b1afc8 100644 --- a/libavcodec/flacenc.c +++ b/libavcodec/flacenc.c @@ -339,42 +339,6 @@ static av_cold int flac_encode_init(AVCodecContext *avctx) if (s->options.max_partition_order < 0) s->options.max_partition_order = ((int[]){ 2, 2, 3, 3, 3, 8, 8, 8, 8, 8, 8, 8, 8})[level]; -#if FF_API_PRIVATE_OPT -FF_DISABLE_DEPRECATION_WARNINGS - if (avctx->min_prediction_order >= 0) { - if (s->options.lpc_type == FF_LPC_TYPE_FIXED) { - if (avctx->min_prediction_order > MAX_FIXED_ORDER) { - av_log(avctx, AV_LOG_WARNING, - "invalid min prediction order %d, clamped to %d\n", - avctx->min_prediction_order, MAX_FIXED_ORDER); - avctx->min_prediction_order = MAX_FIXED_ORDER; - } - } else if (avctx->min_prediction_order < MIN_LPC_ORDER || - avctx->min_prediction_order > MAX_LPC_ORDER) { - av_log(avctx, AV_LOG_ERROR, "invalid min prediction order: %d\n", - avctx->min_prediction_order); - return AVERROR(EINVAL); - } - s->options.min_prediction_order = avctx->min_prediction_order; - } - if (avctx->max_prediction_order >= 0) { - if (s->options.lpc_type == FF_LPC_TYPE_FIXED) { - if (avctx->max_prediction_order > MAX_FIXED_ORDER) { - av_log(avctx, AV_LOG_WARNING, - "invalid max prediction order %d, clamped to %d\n", - avctx->max_prediction_order, MAX_FIXED_ORDER); - avctx->max_prediction_order = MAX_FIXED_ORDER; - } - } else if (avctx->max_prediction_order < MIN_LPC_ORDER || - avctx->max_prediction_order > MAX_LPC_ORDER) { - av_log(avctx, AV_LOG_ERROR, "invalid max prediction order: %d\n", - avctx->max_prediction_order); - return AVERROR(EINVAL); - } - s->options.max_prediction_order = avctx->max_prediction_order; - } -FF_ENABLE_DEPRECATION_WARNINGS -#endif if (s->options.lpc_type == FF_LPC_TYPE_NONE) { s->options.min_prediction_order = 0; s->options.max_prediction_order = 0; |