From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 9314F4296C for ; Sat, 7 May 2022 11:35:18 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9F0C068B4D6; Sat, 7 May 2022 14:31:12 +0300 (EEST) Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05olkn2010.outbound.protection.outlook.com [40.92.89.10]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DD5AA68B4C1 for ; Sat, 7 May 2022 14:31:08 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=IZL9TTsc5+qZG6lmGRE1MPUxIsCWZ1eMR5a9ZZ8c+rtGN6bW+IXrvkUgvICegUdi6ZGCHHfKnommqnVfy2K4m+yshJdOGu9rVW02WuFuONQd2a7x24LWZnsuowQp23QsjnJ3ixd5PnWcWr3l6WDCKwM6pLHVjg8b/iK7ZcOIRIKU9AR67FZRkrpLbCLWpsPLKnvREY0TwkQSO6Ej1z/wT42BoIZZujX+dG8bB0ehZCFZNDyxiGsCbgTH0TXxc6xRuQOkE3KoZoi/3u5DWcrtKxZ3a78CkF3SjIj8Ex9epkQN9a7acxsj0k/cA3Nh5kd2CSVbGru3EFIuSNUQeSAmTQ== 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=pdV0dSGkz6l/gh2b8G4JxXgTlTEoNk/7GNj03fS+Las=; b=hVxH/2YYBlaKqPhaU1MZqnG0G1iJdgjOnNS31OtQy7qjfa+t5lQoFipEFzZkqHIuiFkaL4wfMtB8Xc137uBYUGTpdWO9HxEL1zKLstw0D38Ea/7QZMiuczvbLDyMcVt0VdK4vzQ/KdQT6l3DIXcyK2xnn12blpiYrMRYeYy5c5B1N9UuLqbIFEQ46GWdu9iOmXoWa0SC5T5pPkjETTAslBry8M5aUHZc9hQe9XC+kebkGD4ulbAV76+lXJeq7XkBMd1N5ox0GFIWTKZg11j6Lyrl7U9gAgEdiNAzztmLwLBGchbszheCLcZYgRkatpJOt3UoAl5f/zYWPCUHv4clKw== 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=pdV0dSGkz6l/gh2b8G4JxXgTlTEoNk/7GNj03fS+Las=; b=SItJ76xVt/quSmpaam/r8JJSbimKiyzEHjOU3u2YgHjwVC1wsF952f0tDLJWFj+dSDrM+ob6hRYugXLxsAGkjLxVncFTTTcxJ4vNdEaBFk6E4TeQaorfeF9q+4ZsWFRUkLfdGfGdQniGYUiwGaChq/cQnbcxFSBZt6hXXR/hMHNvuyubHo2+0gSKMDi/dgDMsCiNu5ApkUjdC7/SWaOx549iXChSXynffVggnALdBANGPKoOjXEVq267VkV2vP1cFsi8n6re9RfdvifIJUUJIUSezfAqfqEcJZC+VAsBJVfKN4zMqMU8UnV11a3/Efd2l64IbaYfKt63c+h0kUaosg== Received: from AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) by AM6PR0102MB3128.eurprd01.prod.exchangelabs.com (2603:10a6:209:c::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5206.24; Sat, 7 May 2022 11:31:07 +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:31:07 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 7 May 2022 13:28:24 +0200 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [OhN6Q0w9BPW/e8ItrgGw053TxnMpiszO] 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-37-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 79eb8def-2284-448c-c3c1-08da301d0e37 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiRIovyFjHwHllp74iOQFItwx6hL8RKgGgS53utO0ti2q7tW7kMls3JxTOHqTEvKSp1oRsj5O7IkvP1znDUjIwLS8RD3xeu/EvoR48K8BZKZxB07JYuwxUJ/y8ZKIxTpGeFDoiErCYw1GnCS/sSG1NyrQI2J0OqvAtDkmYLXyofyZKYWORxr5IXyEk2bfXh9lTdUfx5prI9Eevv6C4sRlB6HhU30ZFHQTAYV1EQYAbEFB1L+IeIp2ccXPQAEl6LbOHNCg/JpNK9nuq31UowabFeusFi2Ab5vUNdPOa/9+s0Z3Zmoo/q04h8GE9/4nohAUSAyMbpuGqKG0i6bP8JzIxX1rLxBHXSAOySvYQYjYqVGESzbgSYYfSDe9J4PFOle+yTGPzlQmM825OYKGpCtODipbpKpzEMh4R3/3eVluEqDtEDAYzAPg4RC6AE9Yap5ZBQ5Y1Qi/5ZrqeSzLvihgMmku3TOzBNZEHkSHG5FVPbINflbF+Y/D9B4ea6HXTDSaBUGaptH2332qfWZMog+QGNkD08IZVxfolccMJUvHkirnoUxmWEH1S8abW+11Hbf2CD4ja/hhkSXDEOBkhOJFRKzgDAarbDYhpqKrZyHYi6guOg9sUO+iHW0EsY00jTJYcMzq+whj4Z0ZMZWdwHMDHbYZofKK/aphAj7Wvf/RWx3fQqDDvjVUjdgj4bNMJ8beYNof7IzpUIuHMemOgleHKQ3xcgPf/b3SP/mzooftFnUy++jCq7EmARu+5JHwrQX7/o= X-MS-TrafficTypeDiagnostic: AM6PR0102MB3128:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: yNdVvBsnrJ5t2Mfz28i5J31HdFA9sndb6rX51VQR4n+aXQAKypLLJLL7HECJ6f9+cMynThfH88WU22OMeNmbLnejmzQf4u/lF7OwYHeRWjOlmTu0O3M8lHmr6w8eagp5hs3dD9LEZpQeSvZzMm3r2zNMxhf5i9jmbaJ0o/rUax3nQbzQwEpKRIPnpQabkpcgCyP9KTzeRpJooU4+qwv+0B7ST4ahWXOf7Do356FReiFLEPiwRAqySMaUfbYAm/9dFeQadinjeDvqkSh9nDIIwh/XfXih/MQIJkIFcxKvS1SXH4gQr18wL1owpuo1jJKd2PqpflLLLVxg5nNnDRz2GWkAk9QV6Gc+5nH0M13V6Gh4Gk3J9pf+DYNZFGzPYKUKjmJlfeo5kfNjjyNe+7vlfAA1pijE7kIKUEUfWb3T7IPmo7q7nSaALAboyPHrugctG1HN3l4D01OO6E2mn4inM42LoKrz7BY6bc/bRZX96JAmHQfgXFw2Z7Hfl3RIhPS4Ld2OJcsDeyB+iwOFEmGrSWFfAJIO/sjwoawKF7TVpALK5pHnG1CawSEiNRXviSr3MWV768zIBjJGLPIVoIus0f54NibnkT3AEF1rySEvLlz7KvWW2iDC4DNgzqDU9lVm X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?0DHn9i5bxsFgG3Q2BdzqiO4++5ZYdz5drOhKUGoRlchAs5NQ7sGorVgv7E7x?= =?us-ascii?Q?/B3znhaQPmT6JdgFJO0vAIpBU2ivDUjwqYl3zvTdzanwW4jy0Pv9M6I+Cu9d?= =?us-ascii?Q?YwYptP5zE8SayNNrpmCUHx2C2iy9FcXzSl7KSxcetUasVLOTKo/uoIMqJOC8?= =?us-ascii?Q?2oY6IBGU/pg2a0sp1Goxdb6UBAxJccGvvJ860t5DKPG7qqUXbGJ74yeO5g30?= =?us-ascii?Q?XXanFB95X1XnypAQLVdQD8F1pTYaIIEbf9ZlbKCL2tTYpdUNS9otqz7OXM0f?= =?us-ascii?Q?3SxrPeCVIS9jVlstLG8swCfUvLfeWMmp2Joq731m9wKTULJNWskqBBQqdvYE?= =?us-ascii?Q?daqKYgaoE22XSL8AnQi/iFsmB3rUttlEPQTk2djq7tc5HGXr3klEsIebk2aP?= =?us-ascii?Q?mv8pm4v+GyAzA+wBD3R8r3pAwgJMkTWloQHM5pg54o6l8cfo3t/UKNTLF6C0?= =?us-ascii?Q?fJuGJyCOdlC4IkEI5TU6gasXVUuM+rgrbjn4Mh+0hma+VTQiWOKnT/PLpLFA?= =?us-ascii?Q?M+4qtCrFWrTyyn1XvtVTXrcoVux8J7G1OFgLJqzk/tK+C91wFTnFGt387t9I?= =?us-ascii?Q?mTiDvaK6jgqk5OiN30S869LxzunnkeuhVpat5Ne37oqC6OAWR/bM5EkH6hBA?= =?us-ascii?Q?CzJvb5frG/wLsT5CTk16THO/X8EDPo0BWeJylrMcsuMtrrYv/cX+n0GezlTC?= =?us-ascii?Q?tW3PXFUVaF5zrpQCRTaUk02JUNRfnIN5zgY8n0t0POPH0i0bmShRuyjRScnW?= =?us-ascii?Q?4Y9cJPMrE3RyGrjQ//4YAzVzjrFhzSo4jGn2ENFBgMRUX5MaNWAnuZa/Kg3F?= =?us-ascii?Q?4KVG6Awv6XqjF3m4eZTV/rEMQ7PkmWAm+ZKgrbE4awTud/veclxLv9AjEsyg?= =?us-ascii?Q?9m5E1SCt0Nfh5B1SDXhgHrfWYdgh+g2wgco+BsfnOxkbxVun/LFzfUPPxNhs?= =?us-ascii?Q?JKk1fHCl/CHO6lWHv0qVXhco2m9pxMGewZ06SB211PM5qxsY1VV+74fiQcsS?= =?us-ascii?Q?sqzrlG8iYnuDb/zpVBJQpGxRAc4Pccyj3iMQ5bdwbgKSiZ/G8L8j4uwfpkdZ?= =?us-ascii?Q?c7TqjU29OEyhOEeZy/Vp7ewkuWzpc8l3rhwxMMKhcr3636sVOjXd75/i+pwW?= =?us-ascii?Q?7LRTK9UXYK7f/3PIqXR6MCLsVMOJOCGkS6OYfKXJSlLShscLoZB1IRqDfWlE?= =?us-ascii?Q?fq8uZzdPzRc7YoNKmPYwqTpb525YSWe0S4LrjqQthsaY7sWlYdCVcUl4MVPo?= =?us-ascii?Q?cHKax0kgwAr9LkgbbaX0jvzRucols63Bz+nSGDPlHOLNBpxssq0O6aHXjwPq?= =?us-ascii?Q?9mT4N7zd3NvNWcJCVQStnBFuPWRwWAXnN6+ki7RlVNP/4MC7ul6ird1pXoEx?= =?us-ascii?Q?i19nOjEg1XyIsFn+riwkzi04gAHYll6n0sri6pZYdEBgJ8jLMKcE2x8Ks56k?= =?us-ascii?Q?peTI6NoUF11HDjq0+dPRoyKGlE3duZqc?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 79eb8def-2284-448c-c3c1-08da301d0e37 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:30:58.0660 (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: AM6PR0102MB3128 Subject: [FFmpeg-devel] [PATCH 38/44] avformat/utils: Move ff_find_stream_index to demux_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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: It is only used by demuxers (and it is generally demuxers who have to translate format-specific IDs to stream indices). Signed-off-by: Andreas Rheinhardt --- libavformat/demux.h | 6 ++++++ libavformat/demux_utils.c | 8 ++++++++ libavformat/gxf.c | 1 + libavformat/internal.h | 6 ------ libavformat/utils.c | 8 -------- 5 files changed, 15 insertions(+), 14 deletions(-) diff --git a/libavformat/demux.h b/libavformat/demux.h index 209cd813ab..a008c3dba1 100644 --- a/libavformat/demux.h +++ b/libavformat/demux.h @@ -226,4 +226,10 @@ int ff_generate_avci_extradata(AVStream *st); */ int ff_get_extradata(void *logctx, AVCodecParameters *par, AVIOContext *pb, int size); +/** + * Find stream index based on format-specific stream ID + * @return stream index, or < 0 on error + */ +int ff_find_stream_index(const AVFormatContext *s, int id); + #endif /* AVFORMAT_DEMUX_H */ diff --git a/libavformat/demux_utils.c b/libavformat/demux_utils.c index 6e894ae28a..f699c79383 100644 --- a/libavformat/demux_utils.c +++ b/libavformat/demux_utils.c @@ -367,3 +367,11 @@ int ff_get_extradata(void *logctx, AVCodecParameters *par, AVIOContext *pb, int return ret; } + +int ff_find_stream_index(const AVFormatContext *s, int id) +{ + for (unsigned i = 0; i < s->nb_streams; i++) + if (s->streams[i]->id == id) + return i; + return -1; +} diff --git a/libavformat/gxf.c b/libavformat/gxf.c index e61291382a..f720521c1b 100644 --- a/libavformat/gxf.c +++ b/libavformat/gxf.c @@ -24,6 +24,7 @@ #include "libavutil/channel_layout.h" #include "libavutil/common.h" #include "avformat.h" +#include "demux.h" #include "internal.h" #include "gxf.h" diff --git a/libavformat/internal.h b/libavformat/internal.h index acda79821a..44516578b0 100644 --- a/libavformat/internal.h +++ b/libavformat/internal.h @@ -558,12 +558,6 @@ typedef void (*ff_parse_key_val_cb)(void *context, const char *key, void ff_parse_key_value(const char *str, ff_parse_key_val_cb callback_get_buf, void *context); -/** - * Find stream index based on format-specific stream ID - * @return stream index, or < 0 on error - */ -int ff_find_stream_index(const AVFormatContext *s, int id); - enum AVCodecID ff_guess_image2_codec(const char *filename); const AVCodec *ff_find_decoder(AVFormatContext *s, const AVStream *st, diff --git a/libavformat/utils.c b/libavformat/utils.c index c8d975ddcc..68ea1d1050 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -644,14 +644,6 @@ void ff_parse_key_value(const char *str, ff_parse_key_val_cb callback_get_buf, } } -int ff_find_stream_index(const AVFormatContext *s, int id) -{ - for (unsigned i = 0; i < s->nb_streams; i++) - if (s->streams[i]->id == id) - return i; - return -1; -} - int avformat_network_init(void) { #if CONFIG_NETWORK -- 2.32.0 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".