[FFmpeg-cvslog] avcodec/xan: Cleanup generically on init failure
Andreas Rheinhardt
git at videolan.org
Fri Dec 4 17:40:02 EET 2020
ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt at gmail.com> | Thu Nov 26 17:43:48 2020 +0100| [85e1d469af1ed4d4e0bb5b5f26c4cb6f60f8304a] | committer: Andreas Rheinhardt
avcodec/xan: Cleanup generically on init failure
Reviewed-by: Anton Khirnov <anton at khirnov.net>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at gmail.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=85e1d469af1ed4d4e0bb5b5f26c4cb6f60f8304a
---
libavcodec/xan.c | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/libavcodec/xan.c b/libavcodec/xan.c
index 1ccf164847..5318aab797 100644
--- a/libavcodec/xan.c
+++ b/libavcodec/xan.c
@@ -100,16 +100,12 @@ static av_cold int xan_decode_init(AVCodecContext *avctx)
return AVERROR(ENOMEM);
s->buffer2_size = avctx->width * avctx->height;
s->buffer2 = av_malloc(s->buffer2_size + 130);
- if (!s->buffer2) {
- av_freep(&s->buffer1);
+ if (!s->buffer2)
return AVERROR(ENOMEM);
- }
s->last_frame = av_frame_alloc();
- if (!s->last_frame) {
- xan_decode_end(avctx);
+ if (!s->last_frame)
return AVERROR(ENOMEM);
- }
return 0;
}
@@ -649,4 +645,5 @@ AVCodec ff_xan_wc3_decoder = {
.close = xan_decode_end,
.decode = xan_decode_frame,
.capabilities = AV_CODEC_CAP_DR1,
+ .caps_internal = FF_CODEC_CAP_INIT_CLEANUP,
};
More information about the ffmpeg-cvslog
mailing list