summaryrefslogtreecommitdiff
path: root/libavcodec/j2kenc.c
diff options
context:
space:
mode:
authorAndreas Rheinhardt <andreas.rheinhardt@gmail.com>2021-02-25 19:20:01 +0100
committerJames Almer <jamrial@gmail.com>2021-04-27 10:43:02 -0300
commitd85c41b5723a4acf9400043cb533682d2e2c4287 (patch)
tree9e55af93f5fd80b3f8136fe26f52c97387e4b6dc /libavcodec/j2kenc.c
parente1597fe0cfe07e134ece8ea199ff520d3ac77aee (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/j2kenc.c')
-rw-r--r--libavcodec/j2kenc.c7
1 files changed, 0 insertions, 7 deletions
diff --git a/libavcodec/j2kenc.c b/libavcodec/j2kenc.c
index e3c5a32188..40ba965cdb 100644
--- a/libavcodec/j2kenc.c
+++ b/libavcodec/j2kenc.c
@@ -1727,13 +1727,6 @@ static av_cold int j2kenc_init(AVCodecContext *avctx)
s->compression_rate_enc = 0;
}
-#if FF_API_PRIVATE_OPT
-FF_DISABLE_DEPRECATION_WARNINGS
- if (avctx->prediction_method)
- s->pred = avctx->prediction_method;
-FF_ENABLE_DEPRECATION_WARNINGS
-#endif
-
if (avctx->pix_fmt == AV_PIX_FMT_PAL8 && (s->pred != FF_DWT97_INT || s->format != CODEC_JP2)) {
av_log(s->avctx, AV_LOG_WARNING, "Forcing lossless jp2 for pal8\n");
s->pred = FF_DWT97_INT;