diff mbox series

[FFmpeg-devel,04/30] avcodec/flashsv2enc: Cleanup generically after init failure

Message ID 20200915074000.102622-4-andreas.rheinhardt@gmail.com
State Accepted
Commit 42ed9707b5dea6b9d0c05dd796d9dfcab237c95a
Headers show
Series [FFmpeg-devel,01/30] avcodec/flashsvenc: Avoid allocation of buffer, fix memleak | expand

Checks

Context Check Description
andriy/default pending
andriy/make success Make finished
andriy/make_fate success Make fate finished

Commit Message

Andreas Rheinhardt Sept. 15, 2020, 7:39 a.m. UTC 
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
---
 libavcodec/flashsv2enc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Paul B Mahol Sept. 15, 2020, 4:53 p.m. UTC | #1 
On Tue, Sep 15, 2020 at 09:39:34AM +0200, Andreas Rheinhardt wrote:
> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
> ---
>  libavcodec/flashsv2enc.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

ok
diff mbox series

Patch

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,
 };