[FFmpeg-cvslog] avcodec/flashsv2enc: Cleanup generically after init failure

Andreas Rheinhardt git at videolan.org
Sat Sep 19 20:24:14 EEST 2020


ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt at gmail.com> | Mon Sep 14 16:57:49 2020 +0200| [42ed9707b5dea6b9d0c05dd796d9dfcab237c95a] | committer: Andreas Rheinhardt

avcodec/flashsv2enc: Cleanup generically after init failure

Reviewed-by: Paul B Mahol <onemda at gmail.com>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at gmail.com>

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

 libavcodec/flashsv2enc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/flashsv2enc.c b/libavcodec/flashsv2enc.c
index e2a603f312..851abdc822 100644
--- a/libavcodec/flashsv2enc.c
+++ b/libavcodec/flashsv2enc.c
@@ -235,7 +235,6 @@ static av_cold int flashsv2_encode_init(AVCodecContext * avctx)
         || !s->current_frame || !s->key_frame || !s->key_blocks
         || !s->frame_blocks) {
         av_log(avctx, AV_LOG_ERROR, "Memory allocation failed.\n");
-        cleanup(s);
         return AVERROR(ENOMEM);
     }
 
@@ -918,4 +917,5 @@ AVCodec ff_flashsv2_encoder = {
     .encode2        = flashsv2_encode_frame,
     .close          = flashsv2_encode_end,
     .pix_fmts       = (const enum AVPixelFormat[]){ AV_PIX_FMT_BGR24, AV_PIX_FMT_NONE },
+    .caps_internal  = FF_CODEC_CAP_INIT_CLEANUP,
 };



More information about the ffmpeg-cvslog mailing list