]> git.sesse.net Git - ffmpeg/commitdiff
avcodec/xxan: Cleanup generically on init failure
authorAndreas Rheinhardt <andreas.rheinhardt@gmail.com>
Thu, 26 Nov 2020 17:11:29 +0000 (18:11 +0100)
committerAndreas Rheinhardt <andreas.rheinhardt@gmail.com>
Fri, 4 Dec 2020 14:46:46 +0000 (15:46 +0100)
Reviewed-by: Anton Khirnov <anton@khirnov.net>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
libavcodec/xxan.c

index afe60e156477de2f60257919a448314dcf4c71bc..865dfa8f872adbbc3dc878a60bc8464f2a42390c 100644 (file)
@@ -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,
 };