From patchwork Sat Mar 23 13:04:09 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 47368 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c889:b0:1a3:b6bb:3029 with SMTP id hb9csp206713pzb; Sat, 23 Mar 2024 06:06:31 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVKVpYP+5RXVMTE/gwrkX7UL9MQmujb7J0wsZP9Bjl4jK2q4zBVCqLXg/HHjzndEgbPcSpClG+mNC/yYNKsZz0e9iePvF3L6Q9wIw== X-Google-Smtp-Source: AGHT+IG4NQjKevvCW6dCfNqi2yUdEnYJ5IcB83iI0cY4O7VhtrWYQo44Bmg/ML3pqziXwjfoU9BT X-Received: by 2002:a17:906:c043:b0:a46:e51a:466e with SMTP id bm3-20020a170906c04300b00a46e51a466emr1632259ejb.64.1711199190680; Sat, 23 Mar 2024 06:06:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1711199190; cv=none; d=google.com; s=arc-20160816; b=zlbgzVRJRe3lrz/irXtPNbjBSnRH2aTp0tHL8QZSh37LFkdLsm27tJrl9J7PjjrkJD PnNjKMzYr4lEYGgeavrT38NS/+Lxr9CqvEKswrG+ThlCRoDhBatISrrCimDskmDcO8FN 8wDUhjLZdVAY9Rg9sGFb4leZc6sCRJA0wSUqXMhYnWAGGrLhn56VNuFGS35wK69iqlv7 Q1PxYNZ9rxPegXHCbt41facu+x5lM6dqLNjfLZLbCF8k1Q7/vpqYmFxNeeRfqRf/pi/0 1vgFC+d3w/XEb+SRpQ4sFSuxVrNQwor6jb3D1macry4zQrlooNPy0O0oLCvT8T0PDeXk QLIg== 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:dkim-signature:delivered-to; bh=vdPgW/dQgP6AML/7gTS/YaxciatU5B61PUX8UIyVu9w=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=U9W4h0TSKPQBvewCOGGl22GD832FOIOYkQfMGEZY6MM+7BQw3d7zuz9mkqFPfTGtBn B8xsdz0gWcVn4CCJXLeOYpDhxrvcUVkY73yNi1PFZB4JhkXvlTG/OXFAGvxCFGDd2RR6 lc0lR2CTbEqsN9FSh/+gfsn7YOXJCo3fIk7jJUB6QFCTcC29iVhhTYFNr2aXeVzzO4jB kwG+rWv5hqlzuRVk4HwEGZnHCgvLR+DHwfBXGgo+Cj9CqRQXogkUfTjj9gVNYQOilYQk 017hyMHCZCh/BB8ykXTJCFRHKW2LkNvQti5Dlk9HoyTYdbyZFDcCysLFrZ2Awg1BHxJb nFGw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@khirnov.net header.s=mail header.b=cBRgi9y2; 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 h16-20020a17090634d000b00a46a13e555csi889145ejb.838.2024.03.23.06.06.30; Sat, 23 Mar 2024 06:06:30 -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; dkim=neutral (body hash did not verify) header.i=@khirnov.net header.s=mail header.b=cBRgi9y2; 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 5641D68D534; Sat, 23 Mar 2024 15:06:26 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail1.khirnov.net (quelana.khirnov.net [94.230.150.81]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 69C3768D439 for ; Sat, 23 Mar 2024 15:06:19 +0200 (EET) Authentication-Results: mail1.khirnov.net; dkim=pass (2048-bit key; unprotected) header.d=khirnov.net header.i=@khirnov.net header.a=rsa-sha256 header.s=mail header.b=cBRgi9y2; dkim-atps=neutral Received: from localhost (mail1.khirnov.net [IPv6:::1]) by mail1.khirnov.net (Postfix) with ESMTP id D5C814D42 for ; Sat, 23 Mar 2024 14:06:18 +0100 (CET) Received: from mail1.khirnov.net ([IPv6:::1]) by localhost (mail1.khirnov.net [IPv6:::1]) (amavis, port 10024) with ESMTP id 6HFIjondvUAE for ; Sat, 23 Mar 2024 14:06:16 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=khirnov.net; s=mail; t=1711199176; bh=dxLR3JkenrE9QkWWyOvZUoLp0x2DXA1RSYFa4t/2sEQ=; h=From:To:Subject:Date:In-Reply-To:References:From; b=cBRgi9y2vupkzYR+oJEgVRt/7m4dq8iZVkcGzqB7P02AwapPi5NYjCsai8bRqGmdC ZMeTig8df64ma68MiB3XV04UHfHHfOS2KkGT9N/W5be/YrQMjg0vgYgpP8RHQ4VP82 FHKf6PRmVyBT/tCu2G344vEL2EIA08nEAlrgxLs/0/ROxrdTrZiULmYQkE9CYZGXgF +kbmv1piNqF24mHhKBUjXPw3mOaLI/kOJzJB9pc8hjWkebYsKBbxRB5UZlEl4/7EpK M4IZksboO04dqx5peN+PFJqnTtcyK7a9jpPM3Y/lGAps9/h5ZuBjxN+v5gbPecFY+y AbM+tRQdNdjRg== 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 mail1.khirnov.net (Postfix) with ESMTPS id 9D40E4D4D for ; Sat, 23 Mar 2024 14:06:16 +0100 (CET) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id 87F433A0A6B for ; Sat, 23 Mar 2024 14:06:16 +0100 (CET) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Sat, 23 Mar 2024 14:04:09 +0100 Message-ID: <20240323130409.20925-4-anton@khirnov.net> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240323130409.20925-1-anton@khirnov.net> References: <20240323130409.20925-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 4/4] fftools/ffmpeg_enc: simplify error handling for decoded_side_data setup 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: U4VZpxYMtmaZ There is no need to free the already-added items, they will be freed alongside the codec context. There is also little point in an error message, as the only reason this can fail is malloc failure. --- fftools/ffmpeg_enc.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/fftools/ffmpeg_enc.c b/fftools/ffmpeg_enc.c index 61310c67f1..9103fb74c0 100644 --- a/fftools/ffmpeg_enc.c +++ b/fftools/ffmpeg_enc.c @@ -198,15 +198,8 @@ int enc_open(void *opaque, const AVFrame *frame) &enc_ctx->nb_decoded_side_data, frame->side_data[i], AV_FRAME_SIDE_DATA_FLAG_UNIQUE); - if (ret < 0) { - av_frame_side_data_free( - &enc_ctx->decoded_side_data, - &enc_ctx->nb_decoded_side_data); - av_log(NULL, AV_LOG_ERROR, - "failed to configure video encoder: %s!\n", - av_err2str(ret)); + if (ret < 0) return ret; - } } }