[FFmpeg-cvslog] avcodec/escape130: Cleanup generically on init failure

Andreas Rheinhardt git at videolan.org
Fri Sep 18 04:10:48 EEST 2020


ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt at gmail.com> | Mon Sep 14 04:04:27 2020 +0200| [3d51f2a12c97773ec66ec4580f905743f4513ed1] | committer: Andreas Rheinhardt

avcodec/escape130: Cleanup generically on init failure

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3d51f2a12c97773ec66ec4580f905743f4513ed1
---

 libavcodec/escape130.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/libavcodec/escape130.c b/libavcodec/escape130.c
index 1dd7eedd74..a6fda901de 100644
--- a/libavcodec/escape130.c
+++ b/libavcodec/escape130.c
@@ -128,9 +128,6 @@ static av_cold int escape130_decode_init(AVCodecContext *avctx)
     s->buf1      = av_malloc(avctx->width * avctx->height * 3 / 2);
     s->buf2      = av_malloc(avctx->width * avctx->height * 3 / 2);
     if (!s->old_y_avg || !s->buf1 || !s->buf2) {
-        av_freep(&s->old_y_avg);
-        av_freep(&s->buf1);
-        av_freep(&s->buf2);
         av_log(avctx, AV_LOG_ERROR, "Could not allocate buffer.\n");
         return AVERROR(ENOMEM);
     }
@@ -358,4 +355,5 @@ AVCodec ff_escape130_decoder = {
     .close          = escape130_decode_close,
     .decode         = escape130_decode_frame,
     .capabilities   = AV_CODEC_CAP_DR1,
+    .caps_internal  = FF_CODEC_CAP_INIT_CLEANUP,
 };



More information about the ffmpeg-cvslog mailing list