From patchwork Wed May 31 14:54:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 41926 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c51c:b0:10c:5e6f:955f with SMTP id gm28csp3328838pzb; Wed, 31 May 2023 07:58:09 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ55ylemrcdXNjXh/wlnNqgiB3g/q8ZD8UbozP42563VND/xskwl03xrqqEk6UAUUEcZqEXe X-Received: by 2002:a05:6512:21aa:b0:4f3:8223:eb81 with SMTP id c10-20020a05651221aa00b004f38223eb81mr2559259lft.6.1685545088769; Wed, 31 May 2023 07:58:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685545088; cv=none; d=google.com; s=arc-20160816; b=Y/2JEtiyCSt0MTTTkRyKi+nZ5BhjELkqigwXHHFcElpKPGCSKLYBwZdP9i8bLVld19 /AYmznHt3IErTbOTGlwSm6nQRcbC01FmMKzXZ6Fdj1enUAsi7uXESFLsRQ3nWM1/xD7Y e52zFIE0PamEF84djWJC9r88G4QH/+GtDVwwD7WE7q5FyWbft5vSkE6+5S7xcftFNOXr 9DstA+NxGaZxxvnChzwsvGXgZpeOBJvdU2Kf3xw7NWGN/Nc5sySASbZ+Cf6/81y4mQmK Bom6vyfN4tZuDsr7B9nKk31Kmv7FkJKp7GxvAok8rCSPWi281rU6UALWf7oDfOE2NKNC +PCg== 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=LtHQCNKzjFBcxTpjdYt6bAHxct2PPzovToWPCaulFJk=; b=x8xa4xC+gRpAG1YJH6frngqfC8pz799qLBT+C+7KO+I3KLdTS+WwKqUEK4QxJmtq5B C+Umt/u0Hukn6RFZvWFtoIpHosqt7GyI02/7MefFpssvusGPFktHEfqBavcs20GV6fpy fR6XXUg+be45LLTeCKUonI4+Vcljstpb4O/vxYaRI+bhT57CWExBTFQdZ1Gbwfqhw0wA SerO4OXRAk9NljKoAmGRsAqWJV7zN4+FLBBrof7WnACOiGAMsmMzcaWLaZJyUi6WMbkd UoSO4EkNPn5GlQYsj8NV+ao3LRCAcuTOKez7GYDx0C/4ijWRVGfTF4x0i+JNpOaEJGv/ GmDg== 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 f5-20020a056402150500b00514b2458135si2593498edw.284.2023.05.31.07.58.08; Wed, 31 May 2023 07:58:08 -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 EE7AE68C312; Wed, 31 May 2023 17:55:32 +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 72D5C68C2B2 for ; Wed, 31 May 2023 17:55:13 +0300 (EEST) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id 6DC9F240706 for ; Wed, 31 May 2023 16:55:12 +0200 (CEST) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id R6LXRymLgtmy for ; Wed, 31 May 2023 16:55:12 +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 38491240D1B for ; Wed, 31 May 2023 16:55:06 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id 02EAD3A0586 for ; Wed, 31 May 2023 16:55:00 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Wed, 31 May 2023 16:54:35 +0200 Message-Id: <20230531145453.20994-5-anton@khirnov.net> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230531145453.20994-1-anton@khirnov.net> References: <20230531145453.20994-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 05/23] fftools/ffmpeg_demux: do not set AVCodecContext.framerate 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: tP4fqxJ6eKPP For decoding, this field is used by the decoder to export information to the caller; it does not make sense for the caller to set it. --- fftools/ffmpeg_demux.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/fftools/ffmpeg_demux.c b/fftools/ffmpeg_demux.c index 5c15b8bad3..5e5f106368 100644 --- a/fftools/ffmpeg_demux.c +++ b/fftools/ffmpeg_demux.c @@ -1194,9 +1194,6 @@ static void add_input_streams(const OptionsContext *o, Demuxer *d) switch (par->codec_type) { case AVMEDIA_TYPE_VIDEO: - // avformat_find_stream_info() doesn't set this for us anymore. - ist->dec_ctx->framerate = st->avg_frame_rate; - MATCH_PER_STREAM_OPT(frame_rates, str, framerate, ic, st); if (framerate && av_parse_video_rate(&ist->framerate, framerate) < 0) {