avcodec/cavsdec: Cleanup generically on init failure

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt 2022-02-08 12:13:31 +01:00
parent 71bd076b30
commit 805d7414dc
2 changed files with 2 additions and 3 deletions

View File

@ -812,10 +812,8 @@ av_cold int ff_cavs_init(AVCodecContext *avctx)
h->cur.f = av_frame_alloc();
h->DPB[0].f = av_frame_alloc();
h->DPB[1].f = av_frame_alloc();
if (!h->cur.f || !h->DPB[0].f || !h->DPB[1].f) {
ff_cavs_end(avctx);
if (!h->cur.f || !h->DPB[0].f || !h->DPB[1].f)
return AVERROR(ENOMEM);
}
h->luma_scan[0] = 0;
h->luma_scan[1] = 8;

View File

@ -1319,4 +1319,5 @@ const AVCodec ff_cavs_decoder = {
.decode = cavs_decode_frame,
.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_DELAY,
.flush = cavs_flush,
.caps_internal = FF_CODEC_CAP_INIT_CLEANUP,
};