[FFmpeg-cvslog] avcodec/xxan: Cleanup generically on init failure
Andreas Rheinhardt
git at videolan.org
Fri Dec 4 17:40:18 EET 2020
ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt at gmail.com> | Thu Nov 26 18:11:29 2020 +0100| [e645f0f0d3049f13f2a95b491226702054a7038e] | committer: Andreas Rheinhardt
avcodec/xxan: 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=e645f0f0d3049f13f2a95b491226702054a7038e
---
libavcodec/xxan.c | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/libavcodec/xxan.c b/libavcodec/xxan.c
index afe60e1564..865dfa8f87 100644
--- a/libavcodec/xxan.c
+++ b/libavcodec/xxan.c
@@ -71,16 +71,12 @@ static av_cold int xan_decode_init(AVCodecContext *avctx)
if (!s->y_buffer)
return AVERROR(ENOMEM);
s->scratch_buffer = av_malloc(s->buffer_size + 130);
- if (!s->scratch_buffer) {
- xan_decode_end(avctx);
+ if (!s->scratch_buffer)
return AVERROR(ENOMEM);
- }
s->pic = av_frame_alloc();
- if (!s->pic) {
- xan_decode_end(avctx);
+ if (!s->pic)
return AVERROR(ENOMEM);
- }
return 0;
}
@@ -447,4 +443,5 @@ AVCodec ff_xan_wc4_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