From patchwork Sat May 7 11:27:59 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 35647 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:a885:b0:7f:4be2:bd17 with SMTP id ca5csp2121459pzb; Sat, 7 May 2022 04:30:47 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwfioKWnlfvLWkYkKGs5FyYbX0P1zbtLDJFZsGFEDJ0dKsVst3B+deTiBceeEANiMqtsBwf X-Received: by 2002:a17:907:e91:b0:6f4:d1e7:417d with SMTP id ho17-20020a1709070e9100b006f4d1e7417dmr6943510ejc.123.1651923047087; Sat, 07 May 2022 04:30:47 -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 dz22-20020a0564021d5600b0042600135621si9507059edb.546.2022.05.07.04.30.46; Sat, 07 May 2022 04:30:47 -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=S6B1V4Og; 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 7224168B427; Sat, 7 May 2022 14:29:23 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2058.outbound.protection.outlook.com [40.92.91.58]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A587668B413 for ; Sat, 7 May 2022 14:29:20 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ZHVL6RSk9FdLM16YiABYJO9MFXUosjbmHifiCrHYBawj03w9ezm9skLuApQaoEp3vh2QOwL0QIvMhUitmfn9+e3TB1PjP26h3KWGDox2Fx4rLf/elhvf5An2nBH1OcHa02VGREifv+SMO6vIvPRTv1wUVkB/Lsd4AFgxWfbV2/hYOlF2VCD4WIKgSBOsROrrS5IVKxnoUJ9blhs4pSJUur98uIrDDGq4kSNWYsCltmqouuEPRzILC9Xp6b/Kwn3eO5MZqKWHtPO1AwKkHppssjYHxySMcBNBjiQzbRkxD5Qo/jdxYbytT91REmMBdRoMZfpBt4+/QpyKgPBaEUftuQ== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=XPIAoYRXr3aQu8cRamV750+30mGeT8EnnEohWmuyLCQ=; b=VQaM9Oqy6fJ1nuFLOJLAwCvetPvG2Ztl2IMrwzK8bumLwOqDWby417K5rB0VQrp7JlOY35Y2RmGaVey3ORXIG4i1Do4UWn6QeH/tfhFX+rTQnwrZgePbdycz5h0jIphgiem/AimOplBs3m0g6gMCNZET+vXtO2cGFmhru/6U00sj/J5I6Lj4z4D6F8TBhjm8VCyYso3szuvFHCz8X4+zv1bViFRGDUGbclvTTkjbkVuRBntHOf6u2yz1vh4xyNncCQTshHCiTWMgGox2+WgcDTYGjZPKgbj6Djep1cOR22B7R1TGzBPH0946Xes9RfdJC24stlI8lvv4Cm9zhHFdXA== 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=XPIAoYRXr3aQu8cRamV750+30mGeT8EnnEohWmuyLCQ=; b=S6B1V4OgscJuhApnvcRh1n/79IH01aGEiNVt/01hBYZNBsL2+5lg7SDCYsFDhvz8UlTge0TDZskiXZ0vnnk/A5OGFVa76vD0jVhkIf0ZNtYVycMDMqMdQt1CQGcNkqw0YVgwt4UTlM7pXjUtNmylHmU9kENG/z+vO+hDw3I4fifjKlWXVlzcUKZoCucg/jOoD7lD/a4qBPjPuH4jGEeMCCxQk43D83gFYEmbRegsAOwYHTTQaW0fVil7KA0AJmQeQxOkD1tYljuXXXkWif3gd5m4fqR/59upKC3v2xDy+nWwvnFTPu+NDTLTAoVoE0nz40SDUv0lAXHR53Denaqzxg== Received: from AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) by DB6PR0102MB2663.eurprd01.prod.exchangelabs.com (2603:10a6:6:e::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5227.21; Sat, 7 May 2022 11:29:18 +0000 Received: from AS8PR01MB7944.eurprd01.prod.exchangelabs.com ([fe80::1854:2c30:7ba1:c431]) by AS8PR01MB7944.eurprd01.prod.exchangelabs.com ([fe80::1854:2c30:7ba1:c431%6]) with mapi id 15.20.5206.024; Sat, 7 May 2022 11:29:18 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 7 May 2022 13:27:59 +0200 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [qTpoEWO1CO9YIoIyGCXeI4RglpDCLNeo] X-ClientProxiedBy: ZRAP278CA0004.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:10::14) To AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) X-Microsoft-Original-Message-ID: <20220507112830.406162-12-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 9df1f583-5840-48d7-58f4-08da301cd308 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiRIovyFjHwHllp74iOQFItwvvk6DDt2i15llpQiBWE4cn4N7LnXPL87PNm996OXK7DoUJ98XXzDazZaCf9bKJn31KGVWpTxIgujVN7cCnwecZ8PKmXZ0bzbw/TGD6yDMl3whoa/myaCUm1mWVCzxwlcjwVyG+vNDBl86LuvkWVKULsGGMj8SV+uPxT3oUUQsNvfKI20blS8CBKYX7pCWPWSkQxkXnzK15MYVXleavWb4wbdWHf54mngQTuiBvWzqlMS5aF4VJNtOxAEpov0m1TtVlqCqqcn+rdRhA0CHwDY36y6SPb7eBc/AepDAKwNMB8jB2C0QCKDSuqlM79K1sevtgrsqzDILZtCtcjBBv0XknEziIqcdz8eXCRPAHUteAaYPqeUYk3GRjwyGXdUXmikBHWONZG2Ja0HUIsdfL9Gg02GYksYld9b8U6nyKVBXXNm/Rpqbo7mY88yr7x5oM6cYUf2FNDzi3ZFc86rKURoah3cXz6vMAt6KAqqACIPyPxjOpNxB5zBbvmJ9v7XsGmoVzx5AXUO33H1GKRFScEoKAaPuwIw0qfQzXCUXNEJC2SNiWbcchs0yb1eUT5iuQR37cMtKoyHhqnahLPr8AX89xyzAg65PNtDEzuHzaKkkSV3DZJnpPpXlod0TSh5wb3xtOKEJ5EM3RcdsHaBWTdVlOdfJZkFXnJDlS++GsVyPxBF6u/M96Kqvhpm1McZ7XlRl/YBGfo+iGYIC4soTnwk6OfG/zbdzgZYUc/z8mouZ3w= X-MS-TrafficTypeDiagnostic: DB6PR0102MB2663:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: WvmqfoyXBL3mT9n1zftDu7BaOAbh9/VyZ3/u/wgG8l8Kk0TxK0Eb/9bh8Uy4usAiQN2W/lGVpHIdQiKRRFEm2SWsSUmGR90+gJU/lLd4+gaqmZlWB99spMMEKPAkueCZBHD+HZrVt5vKCo89uASddfQcHvFRj1BDQKDDNfYKuqo9F/+MHUwfE7R3DiSr07t89p3p9yppaQdP/lQC+3T8sRoBOoFbl2sKaG4J7hUaeFkNS7cQ0bdWXn1o8cGzRRp3MwE8JH6unX1ks8vB2FobajnUmooL99yuTneJ0xA0vB1opVUkNhQAPKq3XranKZ0/Q/sFcBQqg5F1WIe/YT3Tu/s1YDKMn1pliIpFGoOrdpnDNomzQBHqMHEfxZ6eUKu+yUhsWoN7/PBVVOUOZlclIiZirqM3KG5DWA9TBizP7RBeHfiqhVXmipvs5GZmCmMby7OlVY+SzSZLoO6qqu4ylzdCUODX0gGyQKj6M9cF2ugImfwbEFztAVAqzJdJT5XMozriHPq8E0thqkKrVtt5ZSKqTmv7tqee82CQR8fJcCzOSY+OfksUFKTNXoAywHBpIEpdrU6mcNJp0YqKS0tnBtOpISviqss70MohmF6443KMLzFper4YZJCT6coEEstl X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: D7U82T7HDPcdW3TU4w51XI+B9LtY1mwPwzRv1GeEqONdZHlAv2i1de7UYF3IbLdiHCKEZ+22REQLXtec0pzQtNCpmK4ZIqhTq8SKljUBJd6Ny8Umn1rCk9jpSKCZr2Pe7ZXk41Il4V4cCa+DqKoKjwHX5O7+Oppf5YbFA2q4OD146eCHHOEsjyzNlZEGD9AMrsvXN/Kz382C6Yaih7D9LN5rauF0ZXPq0axPE1UXw17k1r0t6b9N9RpGNWmo9jg8QG0vibSmVMdjwNuOTAymL4wio5D3l8j6IkDIeS7sboQrW+wpsvefTiBbgTczwJakcXcsscw5s6pztSjBHLLgMwcnwZqinnGx5c3CR1HplPqV9FwLvp8K/VYqeROUPBDk7AC2Liwk6O1NditJmufgIkJenDAWpFblJRw0PPP69dK4R+dcxPJ0yfrV3/hSF0lmaA6moR8syGn59iZQzSY4rWmTWnExF9+qn1MKRbEJ0YF8PoZVssXt+borODWPfAsPqEWvlV/I92/u0jcb8ohaEsDKfStZMml04ThlY9fnWFnUsBj89n0D1FCdUnPeFXuyOUz/5fmpUhplww/xLsh5/+fm22PiYOZ0TG3X2/KkzT/7CfhInR33lQOpnagYKd5X4B7NIuE2jEVMsbmJ65ZIPiqFOq7kLQf0o3ddJjT2opwh44fc3M0nfWkcxecfm0l4JimyNQkLebv5nCHfT9Q+ubgh30mPObQwWOO6MO+cqN13Qzmt9Mryd8R/vxKdbbljSYOThNviA7HuHQfjPVKwCRAMBPCeUC7RjJvndlmVUKfh4HvZIPXlCfFvydKRfxH/WVDPV6K6zhLNhKcvcd9qR2tw7cv/zUI/VoUACA/8bMRyyDqMw/U66jDh1pb3yUSCAlrktL1P/NZ86e7CbkYP6asetVvgQbcwZEgb/T4yQJL3FwXGNAQ6EFfDMEueXWT/3bquEoygZQmi1BZJzCAVuYFpLwM6xNv9P2XJl3PL+fkUPwP2I7GbY+w1u+/+MHM43Bda3LTmy6L9TyHAMWwcznK92gHHvoQnXkKb14M1qswiYHFGShXgFOkCrwVHj81uogPC7FvEKNHoi8ViaYHdKzamajB96wbxA9OI+IJhCRhTXvXi+0F6kbliDZATFZa2OI8/0vwVrpizsDYBITn5s0PPBv+cGivqqhv1MqA20LQ3nyRowDeOXdTPWDbgG8dLsKWkNVKXa7dW6/MuR41nlo1K8m/ijUtr+wReO7xEH7t/Y2QBP1F833ZZgMPjRZzVYr208aKmB9havLn7qLUFb6bWt9aqgwVZG1LgtA5mQFIXW1/+HQQzPYa5jdxvo1NwIXtYY9gghaE8zGOXg3fGTh+WZgZRAcGVP4psrWckSWDJ9x/VDXpKSPwGPtjGwUlv+CSIyiGir6rjV3wbWsihicTVubUXf+cPgUAqEvmn0NWrJemK1SncAbL1sbVaa371 X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9df1f583-5840-48d7-58f4-08da301cd308 X-MS-Exchange-CrossTenant-AuthSource: AS8PR01MB7944.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 May 2022 11:29:18.7696 (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: DB6PR0102MB2663 Subject: [FFmpeg-devel] [PATCH 13/44] avformat/utils: Move av_stream_get_end_pts() to mux_utils.c 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: 783TIYjE4+hF It is only to be used with muxers. Signed-off-by: Andreas Rheinhardt --- libavformat/mux_utils.c | 8 ++++++++ libavformat/utils.c | 8 -------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/libavformat/mux_utils.c b/libavformat/mux_utils.c index 5930a7911a..2fa2ab5b0f 100644 --- a/libavformat/mux_utils.c +++ b/libavformat/mux_utils.c @@ -29,6 +29,14 @@ #include "internal.h" #include "mux.h" +int64_t av_stream_get_end_pts(const AVStream *st) +{ + if (cffstream(st)->priv_pts) { + return cffstream(st)->priv_pts->val; + } else + return AV_NOPTS_VALUE; +} + int avformat_query_codec(const AVOutputFormat *ofmt, enum AVCodecID codec_id, int std_compliance) { diff --git a/libavformat/utils.c b/libavformat/utils.c index 640ce57f82..44ceeecac6 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -62,14 +62,6 @@ int ff_unlock_avformat(void) return ff_mutex_unlock(&avformat_mutex) ? -1 : 0; } -int64_t av_stream_get_end_pts(const AVStream *st) -{ - if (cffstream(st)->priv_pts) { - return cffstream(st)->priv_pts->val; - } else - return AV_NOPTS_VALUE; -} - struct AVCodecParserContext *av_stream_get_parser(const AVStream *st) { return cffstream(st)->parser;