| Message ID | AS8P250MB0744D3B9B9591AC272CA6B6D8F592@AS8P250MB0744.EURP250.PROD.OUTLOOK.COM |
|---|---|
| State | Accepted |
| Commit | 601bb6a739c5073e25d13e6fd6541b72ac905c72 |
| Headers | show |
| Series | [FFmpeg-devel] avcodec/mss[12]: Cleanup generically on init failure | 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: > Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> > --- > libavcodec/mss1.c | 3 ++- > libavcodec/mss2.c | 9 +++------ > 2 files changed, 5 insertions(+), 7 deletions(-) > > diff --git a/libavcodec/mss1.c b/libavcodec/mss1.c > index fb5fc34ea1..5460673133 100644 > --- a/libavcodec/mss1.c > +++ b/libavcodec/mss1.c > @@ -206,7 +206,7 @@ static av_cold int mss1_decode_init(AVCodecContext *avctx) > > ret = ff_mss12_decode_init(&c->ctx, 0, &c->sc, NULL); > if (ret < 0) > - av_frame_free(&c->pic); > + return ret; > > avctx->pix_fmt = AV_PIX_FMT_PAL8; > > @@ -233,4 +233,5 @@ const FFCodec ff_mss1_decoder = { > .close = mss1_decode_end, > FF_CODEC_DECODE_CB(mss1_decode_frame), > .p.capabilities = AV_CODEC_CAP_DR1, > + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, > }; > diff --git a/libavcodec/mss2.c b/libavcodec/mss2.c > index 2237cc8bb1..d54a1220b5 100644 > --- a/libavcodec/mss2.c > +++ b/libavcodec/mss2.c > @@ -886,14 +886,10 @@ static av_cold int mss2_decode_init(AVCodecContext *avctx) > c->pal_stride = c->mask_stride; > c->pal_pic = av_mallocz(c->pal_stride * avctx->height); > c->last_pal_pic = av_mallocz(c->pal_stride * avctx->height); > - if (!c->pal_pic || !c->last_pal_pic || !ctx->last_pic) { > - mss2_decode_end(avctx); > + if (!c->pal_pic || !c->last_pal_pic || !ctx->last_pic) > return AVERROR(ENOMEM); > - } > - if (ret = wmv9_init(avctx)) { > - mss2_decode_end(avctx); > + if (ret = wmv9_init(avctx)) > return ret; > - } > ff_mss2dsp_init(&ctx->dsp); > > avctx->pix_fmt = c->free_colours == 127 ? AV_PIX_FMT_RGB555 > @@ -913,4 +909,5 @@ const FFCodec ff_mss2_decoder = { > .close = mss2_decode_end, > FF_CODEC_DECODE_CB(mss2_decode_frame), > .p.capabilities = AV_CODEC_CAP_DR1, > + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, > }; Will apply this patch tomorrow unless there are objections. - Andreas
diff --git a/libavcodec/mss1.c b/libavcodec/mss1.c index fb5fc34ea1..5460673133 100644 --- a/libavcodec/mss1.c +++ b/libavcodec/mss1.c @@ -206,7 +206,7 @@ static av_cold int mss1_decode_init(AVCodecContext *avctx) ret = ff_mss12_decode_init(&c->ctx, 0, &c->sc, NULL); if (ret < 0) - av_frame_free(&c->pic); + return ret; avctx->pix_fmt = AV_PIX_FMT_PAL8; @@ -233,4 +233,5 @@ const FFCodec ff_mss1_decoder = { .close = mss1_decode_end, FF_CODEC_DECODE_CB(mss1_decode_frame), .p.capabilities = AV_CODEC_CAP_DR1, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, }; diff --git a/libavcodec/mss2.c b/libavcodec/mss2.c index 2237cc8bb1..d54a1220b5 100644 --- a/libavcodec/mss2.c +++ b/libavcodec/mss2.c @@ -886,14 +886,10 @@ static av_cold int mss2_decode_init(AVCodecContext *avctx) c->pal_stride = c->mask_stride; c->pal_pic = av_mallocz(c->pal_stride * avctx->height); c->last_pal_pic = av_mallocz(c->pal_stride * avctx->height); - if (!c->pal_pic || !c->last_pal_pic || !ctx->last_pic) { - mss2_decode_end(avctx); + if (!c->pal_pic || !c->last_pal_pic || !ctx->last_pic) return AVERROR(ENOMEM); - } - if (ret = wmv9_init(avctx)) { - mss2_decode_end(avctx); + if (ret = wmv9_init(avctx)) return ret; - } ff_mss2dsp_init(&ctx->dsp); avctx->pix_fmt = c->free_colours == 127 ? AV_PIX_FMT_RGB555 @@ -913,4 +909,5 @@ const FFCodec ff_mss2_decoder = { .close = mss2_decode_end, FF_CODEC_DECODE_CB(mss2_decode_frame), .p.capabilities = AV_CODEC_CAP_DR1, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, };
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> --- libavcodec/mss1.c | 3 ++- libavcodec/mss2.c | 9 +++------ 2 files changed, 5 insertions(+), 7 deletions(-)