From patchwork Thu Apr 29 14:38:25 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 27482 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a11:4023:0:0:0:0 with SMTP id ky35csp1550438pxb; Thu, 29 Apr 2021 07:46:23 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzuP1l66cpgY0c/G6ffxrwfxlXXH7PGuCe/YBd6n9Qkzzd21/NJL2EA6A7878z02nuhXoCJ X-Received: by 2002:a05:6402:b88:: with SMTP id cf8mr18604179edb.227.1619707583355; Thu, 29 Apr 2021 07:46:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1619707583; cv=none; d=google.com; s=arc-20160816; b=ggw1VCKri4M7DpmMGLbIF50fIezMvXxgqvxQWUN0Ny+uzP9oSLB8J5M7bQhYTlbw39 OEMi30YtiRE17NtbBmzM2kDY4m1ICxopH+iVhlqERjtqufHM4VmXb2wg/0SDLyNCrjwc p1g0IXB5Xw96iG/rxq+4QOP/iDEg3Us1jK5/FYHYR9Y7bFFwxtFR5fxNGCks5S4o5res wr1h82gHDd1X6ZeVX6FWx8djsJruKshYrqP3Pl2C/KiAIBBwqhBKuuNpO0q2gcTV0yEC 4TRWklxAYpZHGZMA/EqjT6gVho9YGiNkHudpp2wAYnFwfANVysH6xhLS6DLaq8CIHNdc JkCw== 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:message-id:date:to:from :dkim-signature:delivered-to; bh=2snq4eIwmozmZWKktyaNc92bFvqiHaZ/zcg7rjfSbRM=; b=phB+0CyHybTCnam/k53UKkNt+c7QZSOtlXkJsj6jDJj0btkKvNDrUqHYL8rTpUPH+6 zA2WBB7xmfus710V9Lec9fSJNAY7OnnhSkLtmT+7R3nQ32Bzxf52biTQVIJWFc89TvNu GH2cOG77JRIN8BrTt9RScg0oUvUlxRP8GwRGrX3RdHJp5MfwdBo8BgZLKnlOeeqYiXs2 Vx1aUkFD40AJRQiqQqlDfgXYdxjQree31vHyStwrvk+dIUR4l1ndabkCGuoxXaRj+KNl U2Fn2uqSPfZhdpG0QEoXJAuFR5qJaPE3FnO0vjpPP3D0lhWWFkqMx9cG6WIFMoIRqSTK JU4A== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=B5x+pPkA; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id ds2si166905ejc.749.2021.04.29.07.46.11; Thu, 29 Apr 2021 07:46:23 -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=@gmail.com header.s=20161025 header.b=B5x+pPkA; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 574AB680A68; Thu, 29 Apr 2021 17:46:08 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f170.google.com (mail-pg1-f170.google.com [209.85.215.170]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BB4C2689C0A for ; Thu, 29 Apr 2021 17:46:01 +0300 (EEST) Received: by mail-pg1-f170.google.com with SMTP id y32so47298515pga.11 for ; Thu, 29 Apr 2021 07:46:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=6QyRxou3D8tjtxET3F77D6asJl2ofssbzeYESIzMzF8=; b=B5x+pPkASSUgrBefK6qz6IDate6uhWnBXxZMIc2OBC1EEZvlPWzfJh/sHADJfaEs7T jjsksmnR16oZqHugePcOyhZEE1czpzhrBPVFWk3m8Grusey+QyDM1q81g1OF17ryHmUB sYJfEL0rFr+YwQAOSZ7+vuZc6Jk5eUe1bMFiioL6TPqneW5OEAYaTD9fY7K5nXGGgsvL Ng+6dLRhIkdSogt6FIu4Ja582U/ndJtPDxumxST2czk4IEkJNEGD2xZZ8v9mvUIfYltg dVfmES8H63EgcWgg3gIy40QJyPVIjIfcOQRo/J+Od4Nlm2ffhho0SYJ+CCGLe0q1C61J gQnw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=6QyRxou3D8tjtxET3F77D6asJl2ofssbzeYESIzMzF8=; b=jJ+lzyTGZjEnLWqulN61GLY1XJI7HybAQ8HhV70p67+KnilI3odLcDPu8j7V60Sg6l Wjaa2whqIklm4a/HxhVRkzfanqWWpsJ8dm/Zx34zY5+S9iNyY+twvebwPBRJtT1xgQQc ivlnprINsEhQUicAjqlJiyUEnzxqsGY86mEfeuKOua9jI7cCuUhWcYGkPd9ZhooUrLE0 bWP0pr/vgfaqmF4IFPegyBEL2mnm7YzmQvBAeFkiJ2U2Z8ltMQydozp07nYseOQm6vNL CrLkuilxSSBUCOZHbwAEx7wfMbiE+fvd5hSpX/ioGw2NipRdWcgtUqrrDewdu1c0USF5 Q6SA== X-Gm-Message-State: AOAM530nurw/zstoAkU/qaADxBSe+lgb9SnG6r8xARNlH2YVc999KWVT OPqp+1cpEaZJUPNl/iXWa8rHtTRK1fU= X-Received: by 2002:a0c:aacd:: with SMTP id g13mr35232383qvb.41.1619707121366; Thu, 29 Apr 2021 07:38:41 -0700 (PDT) Received: from localhost.localdomain ([191.83.208.172]) by smtp.gmail.com with ESMTPSA id d19sm42271qtd.29.2021.04.29.07.38.40 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Apr 2021 07:38:40 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Thu, 29 Apr 2021 11:38:25 -0300 Message-Id: <20210429143825.53040-1-jamrial@gmail.com> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] ffmpeg: stop accessing private AVStream.codec_info_nb_frames 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: wymi499KNG3c Use AVSTREAM_EVENT_FLAG_NEW_PACKETS instead, which should provide the same information in this case. Finishes removing all uses of this field as started by 87f0c8280c. Signed-off-by: James Almer --- fftools/ffmpeg_opt.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/fftools/ffmpeg_opt.c b/fftools/ffmpeg_opt.c index c0b9f023bd..849d24b16d 100644 --- a/fftools/ffmpeg_opt.c +++ b/fftools/ffmpeg_opt.c @@ -2272,7 +2272,8 @@ static int open_output_file(OptionsContext *o, const char *filename) for (i = 0; i < nb_input_streams; i++) { int score; ist = input_streams[i]; - score = ist->st->codecpar->channels + 100000000*!!ist->st->codec_info_nb_frames + score = ist->st->codecpar->channels + + 100000000 * !!(ist->st->event_flags & AVSTREAM_EVENT_FLAG_NEW_PACKETS) + 5000000*!!(ist->st->disposition & AV_DISPOSITION_DEFAULT); if (ist->user_set_discard == AVDISCARD_ALL) continue;