From patchwork Thu Jul 13 10:55:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 42645 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6da1:b0:131:a7d0:bc6d with SMTP id gl33csp2822672pzb; Thu, 13 Jul 2023 03:59:01 -0700 (PDT) X-Google-Smtp-Source: APBJJlGdOpeKI8hZWAEYrL3x68Xsr25Q9lztUGJH58VUCHMTo8AWg4KHOX1HvUmYVWcPrDDMrHSC X-Received: by 2002:a05:6402:b27:b0:51d:e495:626a with SMTP id bo7-20020a0564020b2700b0051de495626amr1332697edb.6.1689245940857; Thu, 13 Jul 2023 03:59:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689245940; cv=none; d=google.com; s=arc-20160816; b=rfdJaEpHwg4FWPlhmShW8c2LbMCEIQdS1y8aUj0kx+laieAYjooo3IgPQP8N6AUbNR 463xHiWcwiJZgOjEPYKNNMYZmEz2UIrznnnLyy5Nxfv/xVMmjzT5MZuhOuYmXeH4pkMp VLQZK7QJrAHZVRQJgjDSu6ptiAf9jSYtiW2mU1GSuGsaTY9qaR5PPtN6+s0ix/yhi5j4 Elc+SbR0P5WzjJd2vDECtpYs9nrq9OVu7N8Q3OpOwB4iywjzvhi/ZtLuYlEoSinhPldw RBRPXxKMXpaM4DppxKhqv/Qnwg7HI/HIzC2DbWk0+7fhnagIAmcs9BDntE2itNU0fizR QHdQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:delivered-to; bh=ZXof/BeFHjyZQWJOezbGScD9GZngbQuEekFGelQ/UF8=; fh=8ZF2QtiKOjBtyn9wuO2cMeZaLsE4aq02Bq77gGK61E8=; b=vs3WLPGeURYYuioprAc0MUlMfggBeqOnxqVF8vguCqE+PFNfCKCt2dEj+yi0v+pH9A +rayVMk1cUXTYirkW6ujD3SOLR/xYP9cKytb0kjqxk8IHWz4Whf5dkuyWlPs9mCE0IBL X7Z7LsmigWsqXRMLXtW3T4KNu8p0bB2LsiU2EWvJcewZVqoOLGhJAj1Cq4CNUw0gMGLK 8+ee8Om/Hgn3+rrEQoKuf3/h4rlf2iel3FAP+fpLe+ZWlBooYzZeARSvEl9WnR96PvQ7 cnOj62aBGX5pnss+XFHpUpXEw7CnDfFwiJCKTy9AjtGUl0QHLatKT57nTiBL3yjCWIEt pcCw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id r15-20020aa7d14f000000b0051ff0798770si1376222edo.633.2023.07.13.03.59.00; Thu, 13 Jul 2023 03:59:00 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 19F0168C6DC; Thu, 13 Jul 2023 13:57:58 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail0.khirnov.net (red.khirnov.net [176.97.15.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1F8BA68C5EE for ; Thu, 13 Jul 2023 13:57:51 +0300 (EEST) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id CE66E2404EA for ; Thu, 13 Jul 2023 12:57:50 +0200 (CEST) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id ioW2FAB73DZa for ; Thu, 13 Jul 2023 12:57:50 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:2a00:c500:561:201::7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail0.khirnov.net (Postfix) with ESMTPS id B50D7240D0E for ; Thu, 13 Jul 2023 12:57:41 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id 6E5963A1531 for ; Thu, 13 Jul 2023 12:57:35 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Thu, 13 Jul 2023 12:55:31 +0200 Message-Id: <20230713105553.21052-11-anton@khirnov.net> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230713105553.21052-1-anton@khirnov.net> References: <20230713105553.21052-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 11/33] fftools/ffmpeg_mux_init: move allocation out of prologue X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 2RGPnJm0DidM ost_add() has a very large variable declaration prologue, performing "active" actions that can fail in there is confusing. --- fftools/ffmpeg_mux_init.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/fftools/ffmpeg_mux_init.c b/fftools/ffmpeg_mux_init.c index 8e640610cd..bd4c0a9f97 100644 --- a/fftools/ffmpeg_mux_init.c +++ b/fftools/ffmpeg_mux_init.c @@ -987,13 +987,14 @@ static OutputStream *ost_add(Muxer *mux, const OptionsContext *o, MuxStream *ms; OutputStream *ost; const AVCodec *enc; - AVStream *st = avformat_new_stream(oc, NULL); + AVStream *st; int ret = 0; const char *bsfs = NULL, *time_base = NULL; char *filters = NULL, *next, *codec_tag = NULL; double qscale = -1; int i; + st = avformat_new_stream(oc, NULL); if (!st) report_and_exit(AVERROR(ENOMEM));