diff options
| author | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2022-02-08 13:11:39 +0100 |
|---|---|---|
| committer | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2022-02-11 19:38:41 +0100 |
| commit | 21c41237d2d36971e3b483c3b737ea4ed2b4914f (patch) | |
| tree | dd406e50facdf58e53c961d551a9e4bf888d3eaf | |
| parent | c6fcd2ae365608a3f8dc79704b30e3762f2ca2cc (diff) | |
| download | ffmpeg-21c41237d2d36971e3b483c3b737ea4ed2b4914f.tar.gz | |
avcodec/4xm: Cleanup generically on init failure
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
| -rw-r--r-- | libavcodec/4xm.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/libavcodec/4xm.c b/libavcodec/4xm.c index cb315cd7e4..cb361772d2 100644 --- a/libavcodec/4xm.c +++ b/libavcodec/4xm.c @@ -1008,10 +1008,8 @@ static av_cold int decode_init(AVCodecContext *avctx) f->frame_buffer = av_mallocz(avctx->width * avctx->height * 2); f->last_frame_buffer = av_mallocz(avctx->width * avctx->height * 2); - if (!f->frame_buffer || !f->last_frame_buffer) { - decode_end(avctx); + if (!f->frame_buffer || !f->last_frame_buffer) return AVERROR(ENOMEM); - } f->version = AV_RL32(avctx->extradata) >> 16; ff_blockdsp_init(&f->bdsp, avctx); @@ -1038,5 +1036,5 @@ const AVCodec ff_fourxm_decoder = { .close = decode_end, .decode = decode_frame, .capabilities = AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, + .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, }; |