| Message ID | GV1SPRMB00475F256E6001BD059C49EB8F492@GV1SPRMB0047.EURP250.PROD.OUTLOOK.COM |
|---|---|
| State | Accepted |
| Commit | 80666fdd2ff1dca33433d7df3f4f09f29116f8cb |
| Headers | show |
| Series | [FFmpeg-devel] avcodec/cri, tdsc, tiff: Don't forward AVCodecContext.dct_algo | expand |
| Context | Check | Description |
|---|---|---|
| yinshiyou/make_loongarch64 | success | Make finished |
| yinshiyou/make_fate_loongarch64 | success | Make fate finished |
| andriy/make_x86 | success | Make finished |
| andriy/make_fate_x86 | success | Make fate finished |
Andreas Rheinhardt: > It is unused for decoders. > > Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> > --- > libavcodec/cri.c | 1 - > libavcodec/tdsc.c | 1 - > libavcodec/tiff.c | 1 - > 3 files changed, 3 deletions(-) > > diff --git a/libavcodec/cri.c b/libavcodec/cri.c > index 0380a0c665..c4eb468610 100644 > --- a/libavcodec/cri.c > +++ b/libavcodec/cri.c > @@ -70,7 +70,6 @@ static av_cold int cri_decode_init(AVCodecContext *avctx) > return AVERROR(ENOMEM); > s->jpeg_avctx->flags = avctx->flags; > s->jpeg_avctx->flags2 = avctx->flags2; > - s->jpeg_avctx->dct_algo = avctx->dct_algo; > s->jpeg_avctx->idct_algo = avctx->idct_algo; > ret = avcodec_open2(s->jpeg_avctx, codec, NULL); > if (ret < 0) > diff --git a/libavcodec/tdsc.c b/libavcodec/tdsc.c > index 739738d9b1..624e219cb4 100644 > --- a/libavcodec/tdsc.c > +++ b/libavcodec/tdsc.c > @@ -127,7 +127,6 @@ static av_cold int tdsc_init(AVCodecContext *avctx) > return AVERROR(ENOMEM); > ctx->jpeg_avctx->flags = avctx->flags; > ctx->jpeg_avctx->flags2 = avctx->flags2; > - ctx->jpeg_avctx->dct_algo = avctx->dct_algo; > ctx->jpeg_avctx->idct_algo = avctx->idct_algo; > ret = avcodec_open2(ctx->jpeg_avctx, codec, NULL); > if (ret < 0) > diff --git a/libavcodec/tiff.c b/libavcodec/tiff.c > index adb49e4525..7687dfd0d6 100644 > --- a/libavcodec/tiff.c > +++ b/libavcodec/tiff.c > @@ -2416,7 +2416,6 @@ static av_cold int tiff_init(AVCodecContext *avctx) > return AVERROR(ENOMEM); > s->avctx_mjpeg->flags = avctx->flags; > s->avctx_mjpeg->flags2 = avctx->flags2; > - s->avctx_mjpeg->dct_algo = avctx->dct_algo; > s->avctx_mjpeg->idct_algo = avctx->idct_algo; > s->avctx_mjpeg->max_pixels = avctx->max_pixels; > ret = avcodec_open2(s->avctx_mjpeg, codec, NULL); Will apply tomorrow unless there are objections. - Andreas
diff --git a/libavcodec/cri.c b/libavcodec/cri.c index 0380a0c665..c4eb468610 100644 --- a/libavcodec/cri.c +++ b/libavcodec/cri.c @@ -70,7 +70,6 @@ static av_cold int cri_decode_init(AVCodecContext *avctx) return AVERROR(ENOMEM); s->jpeg_avctx->flags = avctx->flags; s->jpeg_avctx->flags2 = avctx->flags2; - s->jpeg_avctx->dct_algo = avctx->dct_algo; s->jpeg_avctx->idct_algo = avctx->idct_algo; ret = avcodec_open2(s->jpeg_avctx, codec, NULL); if (ret < 0) diff --git a/libavcodec/tdsc.c b/libavcodec/tdsc.c index 739738d9b1..624e219cb4 100644 --- a/libavcodec/tdsc.c +++ b/libavcodec/tdsc.c @@ -127,7 +127,6 @@ static av_cold int tdsc_init(AVCodecContext *avctx) return AVERROR(ENOMEM); ctx->jpeg_avctx->flags = avctx->flags; ctx->jpeg_avctx->flags2 = avctx->flags2; - ctx->jpeg_avctx->dct_algo = avctx->dct_algo; ctx->jpeg_avctx->idct_algo = avctx->idct_algo; ret = avcodec_open2(ctx->jpeg_avctx, codec, NULL); if (ret < 0) diff --git a/libavcodec/tiff.c b/libavcodec/tiff.c index adb49e4525..7687dfd0d6 100644 --- a/libavcodec/tiff.c +++ b/libavcodec/tiff.c @@ -2416,7 +2416,6 @@ static av_cold int tiff_init(AVCodecContext *avctx) return AVERROR(ENOMEM); s->avctx_mjpeg->flags = avctx->flags; s->avctx_mjpeg->flags2 = avctx->flags2; - s->avctx_mjpeg->dct_algo = avctx->dct_algo; s->avctx_mjpeg->idct_algo = avctx->idct_algo; s->avctx_mjpeg->max_pixels = avctx->max_pixels; ret = avcodec_open2(s->avctx_mjpeg, codec, NULL);
It is unused for decoders. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> --- libavcodec/cri.c | 1 - libavcodec/tdsc.c | 1 - libavcodec/tiff.c | 1 - 3 files changed, 3 deletions(-)