virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-10-30 23:18:11 +02:00
Code Issues Releases Activity

avcodec/mss[12]: Cleanup generically on init failure

Browse Source 
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt
2024-02-27 22:26:20 +01:00
parent 80736531da
commit 601bb6a739
2 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libavcodec/mss1.c
View File

@@ -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,
};

9
libavcodec/mss2.c
View File

@@ -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,
};