From patchwork Sat Aug 29 17:56:20 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 21993 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 7EABC44AD75 for ; Sat, 29 Aug 2020 20:57:19 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6B21368ACB2; Sat, 29 Aug 2020 20:57:19 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EB08868A94D for ; Sat, 29 Aug 2020 20:57:09 +0300 (EEST) Received: by mail-wr1-f67.google.com with SMTP id e16so2117890wrm.2 for ; Sat, 29 Aug 2020 10:57:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=TGFQ7heFVAvIPGfNAmVVjTSw3zSNhOsf2mVbCuR7iKQ=; b=UtX+w5Lvrmt0f1jWOJcIGl5GSOTO/Q0bLomqitxEzG3pK7XXO42lvBxoWmw+00o8Ja JeyEZbgcQYpuPAWdad+MTUdhWpg1YokM1kScUT71YH+hVhRpwVopOJ1BCXJvYw+fSusg Ne0e6Lx5mwp6V6JtTFYAdHLPW4cLgkJfrhZmcm/D/ykBy0z3/TXUO1v6ys5Ls6PjI1ZI T5JL1ueCFm0GOg9x3N3T3rsqED/OJb+/ymdO5Ma8GkRnqaJhbVgzZaFp/WfE1phLNGHm muP0YsVcgm24qSCerZCBWfbcnj1hQ+vVb9B0LXiAm+rCTlp2nCwKDrnjpf9A2T28Pfk1 lPCQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=TGFQ7heFVAvIPGfNAmVVjTSw3zSNhOsf2mVbCuR7iKQ=; b=PhC+G/9ylfXP5CchqNMxCZOcVtJdEaMTJFYIOQEWxeLshp2dIDJuW/M+pFLHj72S3I A7NMw4jL2LHs3+Lc+cQg7EJHS+ISf74s+n4n6HKN/C3EAUHJiZs3XU9oaS5sZSGu7B0H Qh3tNXFAd7M2nLENGA0WocvtwhguKGUr/QFmGmJD2YyOUY8LHavTTL3OnKPUcOcquXhG HhjyV1Z+RcmH3gGEck1/GGzA4ihZodoy3h1g9p84QueY1kmMb9rEcZ0n/x0KKtp8YuAu IFVyyzcrP6HVJjmUOpqQz7BBpw60v0oIZlxQ1jAldZXvEwxsKJ61s9s6l/PXF6cAz/l9 UUqQ== X-Gm-Message-State: AOAM532PwapwzjRLw2h031rD0TqLmMqjSSK2gN/zKE0WZvPV8B+w19dr g/uFaPSnzCWAaeF19SUfknh5pS00bBE= X-Google-Smtp-Source: ABdhPJznRUbnUz2z+2KefASSA+zXRBEdQ2qze9jZZZwjrF5H9hB9bYJ2d4JIOS2yOK7h0rElHo4rNA== X-Received: by 2002:a5d:4401:: with SMTP id z1mr4246494wrq.305.1598723829128; Sat, 29 Aug 2020 10:57:09 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1fb0f.dynamic.kabel-deutschland.de. [188.193.251.15]) by smtp.gmail.com with ESMTPSA id z8sm4016734wmf.10.2020.08.29.10.57.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 29 Aug 2020 10:57:08 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 29 Aug 2020 19:56:20 +0200 Message-Id: <20200829175626.11682-7-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200829175626.11682-1-andreas.rheinhardt@gmail.com> References: <20200829175626.11682-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 07/13] avcodec/roqvideoenc: Cleanup generically after init failure X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Andreas Rheinhardt --- libavcodec/roqvideoenc.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/libavcodec/roqvideoenc.c b/libavcodec/roqvideoenc.c index ac05123dc6..dc6a63099d 100644 --- a/libavcodec/roqvideoenc.c +++ b/libavcodec/roqvideoenc.c @@ -1004,10 +1004,8 @@ static av_cold int roq_encode_init(AVCodecContext *avctx) enc->last_frame = av_frame_alloc(); enc->current_frame = av_frame_alloc(); - if (!enc->last_frame || !enc->current_frame) { - roq_encode_end(avctx); + if (!enc->last_frame || !enc->current_frame) return AVERROR(ENOMEM); - } enc->tmpData = av_malloc(sizeof(RoqTempdata)); @@ -1024,10 +1022,8 @@ static av_cold int roq_encode_init(AVCodecContext *avctx) av_malloc_array ((enc->width*enc->height/64), sizeof(motion_vect)); if (!enc->tmpData || !enc->this_motion4 || !enc->last_motion4 || - !enc->this_motion8 || !enc->last_motion8) { - roq_encode_end(avctx); + !enc->this_motion8 || !enc->last_motion8) return AVERROR(ENOMEM); - } return 0; } @@ -1135,4 +1131,5 @@ AVCodec ff_roq_encoder = { .pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_YUVJ444P, AV_PIX_FMT_NONE }, .priv_class = &roq_class, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, };