From patchwork Thu Jul 13 10:55:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 42639 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6da1:b0:131:a7d0:bc6d with SMTP id gl33csp2822521pzb; Thu, 13 Jul 2023 03:58:37 -0700 (PDT) X-Google-Smtp-Source: APBJJlHyajk3EpR5oF9q6WSPYkUuJ401PXizjjOQDGbbBed5YaG6C1959JuyyFPNg1JNfLLBA6Ot X-Received: by 2002:a17:906:d0:b0:993:e752:1a6d with SMTP id 16-20020a17090600d000b00993e7521a6dmr1110842eji.18.1689245917029; Thu, 13 Jul 2023 03:58:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689245917; cv=none; d=google.com; s=arc-20160816; b=MtqdBncGNHAsOuGqyCE/pN4C+nTTfjnVGOl7en9Ax5JbK6iHm3kPSw5L4y4tqZ9U+t qTxgCa1w2aw+HZh2Jo78x5UHxrYdZa3otzIhRdesmsSgUDp1nGJuSJ74iCpDj7rm3h4y hTQgTrKQ/eQ8szorKS1BLDDZRgd1aQ+LAfMVKfs1FuFDmjwCoI7RY9ogxLwkPiD0q1iW bEq12NRPqCavq3YScUmY7x0xL+BYxgHu5rvAfimq5ZOiKyQFa2p7KpmNqphoszK0JZRi L6I9hfAGOBonrS6tNLILxxyRPSC++UUrrPNqZuIQDMmlvbyYfdG70NnwQfWWDlfc3+T7 7Z7Q== 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=ZddEhDYu2SiP4mcx9lhVRy5NLm+lV/jYkofxDnkMGo0=; fh=8ZF2QtiKOjBtyn9wuO2cMeZaLsE4aq02Bq77gGK61E8=; b=NZ7sOJ/0fKYWFzP6tkUVTSRBBzTbdx1kaGZvE8KW5IwKKIpS/Miohd89VAlXZICFqP ca/GPI++FfC60ljNTDyMYxW0Ggt1JJzSYQJoBtONHS00NH1hJEy8rREu5JnMV0RbViZX 54fIiOLKkl6GUdNQDCZyLuko4Kk/91+thI/YG4edWyIrygE9zwSPBPKCE70I2pfxFpBU oNqJ9t3msi+TduMgLoCF5QGBQIvEdzaGvByn/EOfuriy0oo6kE8Dn+kfeQkT7558aJL9 /eJsjpnxR0eMPOzFRBcBVGPlQUiiiQjKN7OIrnTQnQYOGP2GDySKhaGxQjPC/G6wcp2l IKuA== 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 jj3-20020a170907984300b00992b0932003si7046275ejc.745.2023.07.13.03.58.36; Thu, 13 Jul 2023 03:58:37 -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 9104D68C698; Thu, 13 Jul 2023 13:57:54 +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 B366C68C32F for ; Thu, 13 Jul 2023 13:57:49 +0300 (EEST) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id E54782404EA for ; Thu, 13 Jul 2023 12:57:48 +0200 (CEST) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id RZ_xZy5YOB-t for ; Thu, 13 Jul 2023 12:57:48 +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 A2EB92406D0 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 052943A1E19 for ; Thu, 13 Jul 2023 12:57:36 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Thu, 13 Jul 2023 12:55:43 +0200 Message-Id: <20230713105553.21052-23-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 23/33] fftools/ffmpeg_mux_init: drop an obsolete assignment 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: vVRnYhQ5Qp8G This line was added in c30a4489b44 along with AVStream.sample_aspect_ratio. However, configuring SAR for video encoding is now done after this code (specifically in enc_open(), which is called when the first video frame to be encoded is obtained), so this line cannot have any meaningful effect. --- fftools/ffmpeg_mux_init.c | 1 - 1 file changed, 1 deletion(-) diff --git a/fftools/ffmpeg_mux_init.c b/fftools/ffmpeg_mux_init.c index 4b7961b833..2dba76b82b 100644 --- a/fftools/ffmpeg_mux_init.c +++ b/fftools/ffmpeg_mux_init.c @@ -562,7 +562,6 @@ static int new_stream_video(Muxer *mux, const OptionsContext *o, av_log(ost, AV_LOG_FATAL, "Unknown pixel format requested: %s.\n", frame_pix_fmt); return AVERROR(EINVAL); } - st->sample_aspect_ratio = video_enc->sample_aspect_ratio; MATCH_PER_STREAM_OPT(intra_matrices, str, intra_matrix, oc, st); if (intra_matrix) {