From patchwork Fri Aug 27 14:27:11 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 29831 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp1513479iov; Fri, 27 Aug 2021 07:29:54 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyhU54R6ykHA+XPU/1g89ofYQvp420Oms8hWHOMROLGvh5twQUDJOYpq+DxLH+PvKt56LB0 X-Received: by 2002:aa7:da81:: with SMTP id q1mr10100632eds.29.1630074594293; Fri, 27 Aug 2021 07:29:54 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id f5si6216643ejj.75.2021.08.27.07.29.53; Fri, 27 Aug 2021 07:29:54 -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=@outlook.com header.s=selector1 header.b=lTzlEiJP; arc=fail (body hash mismatch); 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=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id BD534680989; Fri, 27 Aug 2021 17:28:05 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-oln040092074075.outbound.protection.outlook.com [40.92.74.75]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8DA3E680989 for ; Fri, 27 Aug 2021 17:27:59 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=PpzeV/l68CMX3mv7Zewsz+Fe3vYYiULoTY1yw9qI7mSZ0jIV3dPE/NkAriD6rugw97Ni4sU3wOif55tzA/KvDeq+qA3Pr0Ws10TULgGBmI8jREmGMXgeuUtorUkMytg0nkR5Lraq8JprAGVXzQOxqyXhK54kwWoESCY0P2fVzRyrMuKsnVPYZxHohOvdF93yCdXQKUVc2O/2n8QihJFaiyY+7Z2t6bNJ3ufwqs/oY9G7KT1drvZviLrEeOjsDAEYj5uHrxLjJl+YT3ADW61kH5ee3hVFkK6wdEB5dpOSShSRCLJvW+YVFwZc/XJ4G44b82gPtuEr7y/Aky6wLBn2qA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=aDPD7HGHe4hnxeLLe9lGzADJK2SkeQ9z0mDSID/EbHo=; b=gIDgdeagsGJy15kHo/ihXKoSkSb2o4nT/u5UeY4x/rMJSZh7TOPM6ksgQHTleP+gXUvBPYpS7mmRMuiFdm9euoNKTCVg84H87cOwXrXaAIYf9deJX/LTBrElyNmJknJGMSzWdElowJGok+uNIjOE+vPtkEW//ber1/5QWO6N+E2eyPXhIx6d3jkUA2n5Yjj6kuLSKZFmqjDcno71czbY7OY2mZo2lURSDs5L31TM2E0giVeVlASpNeYCnC9IODJCHi1/C5c2U3H96o+sYFWBCHy9krEtadwiZq/Ecc3zqMmEfcKGlmlOrXYNSCuflsTN03XCVXXGzM7nkE1L02pBEA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=aDPD7HGHe4hnxeLLe9lGzADJK2SkeQ9z0mDSID/EbHo=; b=lTzlEiJPwUnau8nsXMUem9A6SLN0syvlIJHQwDBwZf55ehHCYUeYEJPPtWLXOdml8SPvgtRozkSA+eupkfwvyDWFTSx/Xqs4xcUA++CW1UGVzCVooFey3MchEo2r+AUtufJ+7R9psBh7PMWw27KLStgEH9c4hrsWxHG7EgKHbjeNvVQcjkEsuFWpIPEedRo+bMRDPk3jWxxkMT/s3CYJ/Mba19K37SER7du9DzmTuexD8T1b/zlEcBAAWLEDAdZDD/aY8UuoHA/4JBwP7kUHR5evmjUxxwPTUNpyWklzFO56D8w++m1qBoRtNaqemjXG8fMu33HXaFLo1ZzldX60qA== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB3687.eurprd03.prod.outlook.com (2603:10a6:209:30::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4436.19; Fri, 27 Aug 2021 14:27:47 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::5574:1fd:cce2:d590]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::5574:1fd:cce2:d590%5]) with mapi id 15.20.4436.027; Fri, 27 Aug 2021 14:27:47 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 27 Aug 2021 16:27:11 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [Hx8UCaFKDxayCQQVE6jgZ/ifw/qv8Hgo] X-ClientProxiedBy: FR3P281CA0031.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:1c::9) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210827142725.645653-10-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by FR3P281CA0031.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:1c::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4478.10 via Frontend Transport; Fri, 27 Aug 2021 14:27:47 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 5e0fa15b-0689-4087-9310-08d96966d778 X-MS-Exchange-SLBlob-MailProps: +LiGfBxqLEtNCKoPT6rtVE5PzvjguT+vyuTOS9J2m9anvmyPDbg+7xEAgZZvZ64oJ2t4HSpVpXreQCcQU2VqrimTbDhqIfL8zRpKhHTGEkA/vk1TANJnlMI/vOdJsr3CPqCPMP6gScj2eWSnrgjFj3BaAJSvWfQ+tCQabwUblZnGCaGZMi+tyBXWFdRX6fW/Ng+ZRXEaV56u83X0cHL8EdiEk7/yJqoJ+9WCkogPjHs6sNZGEHnzeOeczlVbQPeuiI6cqf/9rk9gNTAgc9A/pOyMzGByW0Lr6XAc/JolWPdusFbu1wkBPMcn7KpBXk9z6hNWwzQaQ057gw5uh4AjdkUu+aKYYdQv9lDzB0ycYc1WUAVsQ6OTrdqdTc80GxSjr9KijfdjeCP8oj4zElimL9LwKzCMiw1F/7WIWyjxoGCe7EErE3HuL13vuY++mAICDSluY+cWYGP0M3mz9FyW1+3frdOT8UXJ/QIdUM163OlZWX6fV6WTBtftB5gSRSRyq2D6jaJu9Sbnvk1evR/Z+T4sP3LR0zN7CtEiZcVeFMaCWrQThv8a5J9Z3si2JwnbRmHHQ3JWHQEtqZQ8LhP4HyZc008kxgM5adh0dxYvEV27WeFCKpoPFW0DLtbGd0NUdpBJL2ipkBqVl3Vu5a1j71l8C8xSw7V4vZqiH2Ionu/cGr5oMaB1KC/ysQibxJlw7iT471p2Bcif1ZvjomljhhLHbGkOCjS9qKukh9lj1t4kl/Vzvxns2/a+X9qo4Ji/Oik1D1WEJToZXn0Pa/+tKgxP01FQ1ec/ X-MS-TrafficTypeDiagnostic: AM6PR03MB3687: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ldjK40rM05y2KLXNa8byLp1+opV6LhfZg511W+qEC6GljkiOxnakSshFkmTzY/ItkEBL9+uqWF8MeM2vIAFRo5qAJilGbLn0Wkv9aiPOx4fQ3XRRuAgr2mjK+3aYi63Eh/yBZZ8TQEYX9acAtTJ7iSq/p7m3SpvenAtDpk1qQoB3/S5PNeYKvhR0yAAf1L/CyZT3U4toxNb2FuCPXbDNwfvWKZXmPs6SC1qGZuR5pkaX7232L2YmITY53lq/DBCW0NxUyE99PhV81CBvQQXl7uM/gblnWueW7OAtz3EMAxJU6bDSNv92IvHp6mDRakLuyYAAnzlTob5QvHwBcUtuL1jmpWNRDzhhplSBLOE6zOd1lo0weeb9TiduN5tnlir+GlzV20bsQZuH/1LUbQe8A9+QRgkEiD++T4uhX/3at1bH9m1fQGcDOyIz98Gtt/x3 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Zolyvrp1A6xENanEtBjxPx+3iphUnyZL/nkrZqZEvT634oeg73mr35eLXsXk+j/tAnCx5ItXaCxgnyYNTTexDh+6mi/aOi4A93Z9Z+jGfDEkidoiCeeztWkrXQtanBteXWmqmldpbFSwD5jZKZHIOA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5e0fa15b-0689-4087-9310-08d96966d778 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Aug 2021 14:27:47.4659 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR03MB3687 Subject: [FFmpeg-devel] [PATCH 11/25] avformat/mux: Don't access AVStream's internal AVCodecContext 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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: YYVfyogqsINE An AVStream's internal AVCodecContext is pretty much unused for muxing: The only place where any of its fields are set is avformat_transfer_internal_stream_timing_info() where its time base is set based upon the desired output format. The max_b_frames field is never set at all, so don't read it in mux.c. Signed-off-by: Andreas Rheinhardt --- libavformat/mux.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/mux.c b/libavformat/mux.c index 6fa1c5495b..b1ad0dd561 100644 --- a/libavformat/mux.c +++ b/libavformat/mux.c @@ -509,7 +509,7 @@ FF_DISABLE_DEPRECATION_WARNINGS //FIXME merge with compute_pkt_fields static int compute_muxer_pkt_fields(AVFormatContext *s, AVStream *st, AVPacket *pkt) { - int delay = FFMAX(st->codecpar->video_delay, st->internal->avctx->max_b_frames > 0); + int delay = st->codecpar->video_delay; int i; int frame_size;