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/huffyuvenc.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/huffyuvenc.c')
| -rw-r--r-- | libavcodec/huffyuvenc.c | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/libavcodec/huffyuvenc.c b/libavcodec/huffyuvenc.c index 2882433db5..218e57600d 100644 --- a/libavcodec/huffyuvenc.c +++ b/libavcodec/huffyuvenc.c @@ -228,12 +228,6 @@ FF_DISABLE_DEPRECATION_WARNINGS avctx->coded_frame->key_frame = 1; FF_ENABLE_DEPRECATION_WARNINGS #endif -#if FF_API_PRIVATE_OPT -FF_DISABLE_DEPRECATION_WARNINGS - if (avctx->context_model == 1) - s->context = avctx->context_model; -FF_ENABLE_DEPRECATION_WARNINGS -#endif s->bps = desc->comp[0].depth; s->yuv = !(desc->flags & AV_PIX_FMT_FLAG_RGB) && desc->nb_components >= 2; @@ -309,12 +303,6 @@ FF_ENABLE_DEPRECATION_WARNINGS avctx->bits_per_coded_sample = s->bitstream_bpp; s->decorrelate = s->bitstream_bpp >= 24 && !s->yuv && !(desc->flags & AV_PIX_FMT_FLAG_PLANAR); -#if FF_API_PRIVATE_OPT -FF_DISABLE_DEPRECATION_WARNINGS - if (avctx->prediction_method) - s->predictor = avctx->prediction_method; -FF_ENABLE_DEPRECATION_WARNINGS -#endif s->interlaced = avctx->flags & AV_CODEC_FLAG_INTERLACED_ME ? 1 : 0; if (s->context) { if (s->flags & (AV_CODEC_FLAG_PASS1 | AV_CODEC_FLAG_PASS2)) { @@ -332,20 +320,6 @@ FF_ENABLE_DEPRECATION_WARNINGS "vcodec=ffvhuff or format=422p\n"); return AVERROR(EINVAL); } -#if FF_API_PRIVATE_OPT - if (s->context) { - av_log(avctx, AV_LOG_ERROR, - "Error: per-frame huffman tables are not supported " - "by huffyuv; use vcodec=ffvhuff\n"); - return AVERROR(EINVAL); - } - if (s->version > 2) { - av_log(avctx, AV_LOG_ERROR, - "Error: ver>2 is not supported " - "by huffyuv; use vcodec=ffvhuff\n"); - return AVERROR(EINVAL); - } -#endif if (s->interlaced != ( s->height > 288 )) av_log(avctx, AV_LOG_INFO, "using huffyuv 2.2.0 or newer interlacing flag\n"); |