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 05000424C4 for ; Thu, 17 Mar 2022 14:21:33 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6EB3F68AA63; Thu, 17 Mar 2022 16:21:32 +0200 (EET) Received: from EUR03-AM5-obe.outbound.protection.outlook.com (mail-oln040092070062.outbound.protection.outlook.com [40.92.70.62]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 42F0768A76A for ; Thu, 17 Mar 2022 16:21:26 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=XbFGUUN8GZUL6UDd6zUwJLoU/AJbs2E/vvfpq1HJJSV5/TKzjR0pr00HDeCFhqOMta0NZSK8IQzy9lS7mg8JJ6iwDAKY0F4pUQegUBI4L7SPT7nifytXDOq4A6Zw9+vq1gtBzl7b5CH5fzyVOrGZSpTdEYLorlISfMLKk4c+G2ZCIAmrk2kAS0Cj/dxr5tuZ4Gom2ipLyslL4qzXWBd4Oyg+9K89Hcb1l9O1wz3MM3p2tQitf+s7PncqJl1FANwsdvyy3QNr17S7QZEUiyIMZoKzFBZbfQblJu81zw4hJSQNMef0Fgy7795sWqBInqy+cpLM5sKY/xKepM36MqbIcA== 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=896dn+ax9hiepW8ZeBVlSCcZnhj3q+kgE3dP4iYHLhg=; b=I+nhefH7QEzjEfB78bjNGCpeDNfU6kOrFltmkV/yf0XtraHe0ZSODmBHzfAEYdxRIvJvAfOLG0sO/L8V5VTckvbufdj4IqQJM+NhqOT7hjWamBVCeh5TRAgvAglBXOQdTwqTXf/6xbLJsNLEETG//xcIRT90B944x+tyn0CuI/2C3TYcOUGkiKR+hCuBao8YW2GI+Kard8RWeZ4BWaBSfLNp7SJXPHYf6Koh5sosviZWbziQDEZtfF1GTdhK4OgOx4njR1JIaLD6yJJcqJ2IKf46EiZdvm2QynaBVqmC0qx8L1d993l/vvJ0jPobE2SpV/Z2Ic9Qc9PLDJIOMH5idw== 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=896dn+ax9hiepW8ZeBVlSCcZnhj3q+kgE3dP4iYHLhg=; b=VEfQE10ZO1rKp9z19lV5ooMjrPktepQDumw6h9N2cDaQpYgKxCgg1fr7LcH6jI+pkABVrHGIO6w0CNoyfmtdEg+FTAD5W2UR9/vdyizMAh1cuEgXXMyYND1aY62tc/UPXgX7WTAb5wpGg5o9DiRdQwIc8lySsSgFpSApodpiFG/bSGSNnR05ddzu+OPV3jh9Ifj/t3LMHt0JNeYo7UvEg43fGdN0D2XU0VKVWEj2gJfD3aneMXsPjNj0RJg8Xjb/JXLQF75xFd+u/MSkeCvu4jPKqFw9Bax5TJQDLRRuq3YFlOW91ha7Mw1fKtM5l/taR2hrz8FJAo5ax+JXkZdKvQ== Received: from AS1PR01MB9564.eurprd01.prod.exchangelabs.com (2603:10a6:20b:4d1::16) by VI1PR01MB5120.eurprd01.prod.exchangelabs.com (2603:10a6:803:d0::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5081.14; Thu, 17 Mar 2022 14:21:24 +0000 Received: from AS1PR01MB9564.eurprd01.prod.exchangelabs.com ([fe80::9070:a5fd:e532:bdf8]) by AS1PR01MB9564.eurprd01.prod.exchangelabs.com ([fe80::9070:a5fd:e532:bdf8%3]) with mapi id 15.20.5081.016; Thu, 17 Mar 2022 14:21:24 +0000 Message-ID: Date: Thu, 17 Mar 2022 15:21:23 +0100 Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: <20220315090532.27295-1-anton@khirnov.net> <20220315090532.27295-3-anton@khirnov.net> From: Andreas Rheinhardt In-Reply-To: <20220315090532.27295-3-anton@khirnov.net> X-TMN: [H4cuMIH1DarMhgZV17Ka9Qc0ZRkvfo9Q] X-ClientProxiedBy: AM6P194CA0084.EURP194.PROD.OUTLOOK.COM (2603:10a6:209:8f::25) To AS1PR01MB9564.eurprd01.prod.exchangelabs.com (2603:10a6:20b:4d1::16) X-Microsoft-Original-Message-ID: MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 97a153cf-6bf2-4cac-5267-08da08216ae9 X-MS-TrafficTypeDiagnostic: VI1PR01MB5120:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ArYOL4xUh/fu258J85MUv8Z53wsLvXf5ayCJm/niWRj7FzGi7Ge8+1DT/2FlBL0OEzdUoA2nbJXjvNnHZdntZ07pFbgpnGBzeENPI4Zs2oFMLIV1LeL/uQfa0h4JjQugiRUiQ0L1ak7ZQcP9145GF6UV+fWmGCRPDqYcOqUN/MBTGvjbETSLfBvM2Ih1gd7lysDasCFUrN0JQrjCBWV5CTfVH4KltA/PWWZgtwsB/iRlj2G1YdkMz/8rDL05c16vSgtOETqbsUpde8L8c6U0GECQCHbLBGQu5kVHXWaEybREeU6yRtfNxvEhs4lNmgZrOP/PzOnPR2NApgDSTOjfxutsRMAvGRFj5fJuBqWWz2e458iG7bFiZxcxZkOMm688Q9Gb+6X0jBTeWRAKcvzQAvWGlNHTsxHSBQpNoT1lzppf9+5ZiFptC2YUJpGKwCOQzroMtX23pCKdMyPXWykTck0bPVeYKtuyLVYoi1Qf0zZ8N29x/2XOhtVb2rYeQ+JvLOTfU4NgrvhkGGrgTViwkzd75JT1B1qDPIFD0D73VfWaAS4b6cS538mnR6HW7dBJeZW7svgtwnaVMMAZHnOK8A== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?TVhHY0lhNVhpSVZGS0pqQ2hXUDk4ZEx1cTNPcXVsbXlqMmZxOVJXdWgwb2Qv?= =?utf-8?B?RnU0R0lWQWdlR0x1YUZNVm56NlBRcHRtZldFREc3STlpVVFQQXh5RENzaVJQ?= =?utf-8?B?SWlOWVpRSEpNa25BVHVKa2JKRDRZVllqeWg0TUxyZDl5aXFuSHBJaUJvaXBm?= =?utf-8?B?OFNKRW5SQjNtUnZnZFFPcWQyTmNuV1BlWjNISS9VTmJLVS9uUGJ4WVRHeG50?= =?utf-8?B?aG42N1FYNXU5citNZHkvd01GZ1EyOHo4cE1DSWNKUHJTc3NOVkhmSlJ3WTE0?= =?utf-8?B?SEtDTWs1cjR2eGZkVGwyYm9ONytlRHFFakwwQi9zRWREeWhSZHlCY0pVZmsw?= =?utf-8?B?ZkhIelRGWEI4Z0FqZFpyWjhUQVlYMGNPYTYyUHhVT3lwUXRZMXpqZDd0Z3pT?= =?utf-8?B?WmhuY055cXFNKzBCeDcwT2VNYWhjOUlFRkUrZDQ5VHRCMEJHSld1RmVqaEtl?= =?utf-8?B?cDNRblRHK2RaRXF6U1N2OUFHUTJDQS9hZGRiOVVvSldMZUpmVDVHaUdzY2FZ?= =?utf-8?B?bURrRzF1U0EwTWFlemV3THlTZ1F4QUlmU2ZKWFo5cmlubmlQVkFhOE9Ic1ds?= =?utf-8?B?Z2NyWWd4MUc3c1pMaU41T3VNMXBYU0V5bmZJL3M2WTc0eVZNYTI0WHRsYXdn?= =?utf-8?B?bEtzTTd6a3FsY2lTUjRLWGY0S1NsTkU1OC9YWlBKQkl0dnBHQWVGR1YrV3RU?= =?utf-8?B?WEZuQUcrUzRlTGVqdkpvUGU1T3Q0OWE4V0VkVEtIKzF6cmgxbkF3bFdNZzYr?= =?utf-8?B?TFhvUzZscEVIaCtFd3RWYlM3Skk4M0lKUXRQVGpUMGZUWTVQdWhyUndERHpD?= =?utf-8?B?eUVaRnNYZ09ONXk3cVRXcE1PeG5jV2l0M1YweW82Zkt5QWcybUxTV2Qxb0xM?= =?utf-8?B?VnRqbk1mc2E1Qk1helJhMURid25oNTkrdVVZc3NHZFJKcVZCd3d6Z0dmR3pQ?= =?utf-8?B?NGRHcFlmdzBzS24yMjBwekVrcUtsRldiaXQzMEpNZGxmVTVMSEViQjlTMkFZ?= =?utf-8?B?eWtQL04ybnBZRUZNa0ZRSGdlci9OQXluSkgyUUFHSXNFSTlhak5ydDBWT1U1?= =?utf-8?B?K25Rck9uSTk3SlpMNW52UkVxWUU5Z2J2VjlLTGRjcFFEQW5GS0ltUXFlYzVa?= =?utf-8?B?MWNnZUlxK3UrMFQrV0JFOVZqaUNqUm9aR1lwL0FvN1pKbm1URG5yMFBMRkdu?= =?utf-8?B?ZTBCaXhKTnN4NUprMWI0Rng5QytOVkJhY1piM0M0b2dRMHdGT3ZCN3R6bENl?= =?utf-8?B?VytNUGU1cG5icjU5anV2UmNKOWRGYnJ1czlGOU5kenVzZUo4NzRDSzhGOHZ3?= =?utf-8?B?YjZ6SFAwMGlkZkR5VUxFSnhBTDJWOFdUWkF3U3pYMDQydEdYQTRWUnZlTXNs?= =?utf-8?B?OWNtSTJQYkpxcjk1djdHTytpMFp3bWYyRTNGR2RnYlBocmJEQzdpQ0M1b0F3?= =?utf-8?B?ZzkreFJySnlCRjhjd2lXR200RlBtbmczTEFRRjdXUUdxOGFIVE5vUTRQRDJj?= =?utf-8?B?WDZKZTJ6Zkk1dXZqeDhYZUNiRm9pRUZWWGFQcktOaWpnYkpRSGNsTVo0QnVO?= =?utf-8?Q?9xCxa7YBA10SNTXfTXqKA158c0DRSau8LrPRyKIwRx8DBL?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 97a153cf-6bf2-4cac-5267-08da08216ae9 X-MS-Exchange-CrossTenant-AuthSource: AS1PR01MB9564.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Mar 2022 14:21:24.8683 (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: VI1PR01MB5120 Subject: Re: [FFmpeg-devel] [PATCH 03/10] fftools: drop useless indirection 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 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: Anton Khirnov: > --- > fftools/cmdutils.c | 4 ++-- > fftools/cmdutils.h | 2 -- > fftools/ffmpeg.c | 4 ++-- > 3 files changed, 4 insertions(+), 6 deletions(-) > > diff --git a/fftools/cmdutils.c b/fftools/cmdutils.c > index 4b50e15eef..0ac98852fe 100644 > --- a/fftools/cmdutils.c > +++ b/fftools/cmdutils.c > @@ -1961,7 +1961,7 @@ static void show_help_filter(const char *name) > count = avfilter_filter_pad_count(f, 0); > for (i = 0; i < count; i++) { > printf(" #%d: %s (%s)\n", i, avfilter_pad_get_name(f->inputs, i), > - media_type_string(avfilter_pad_get_type(f->inputs, i))); > + av_get_media_type_string(avfilter_pad_get_type(f->inputs, i))); > } > if (f->flags & AVFILTER_FLAG_DYNAMIC_INPUTS) > printf(" dynamic (depending on the options)\n"); > @@ -1972,7 +1972,7 @@ static void show_help_filter(const char *name) > count = avfilter_filter_pad_count(f, 1); > for (i = 0; i < count; i++) { > printf(" #%d: %s (%s)\n", i, avfilter_pad_get_name(f->outputs, i), > - media_type_string(avfilter_pad_get_type(f->outputs, i))); > + av_get_media_type_string(avfilter_pad_get_type(f->outputs, i))); > } > if (f->flags & AVFILTER_FLAG_DYNAMIC_OUTPUTS) > printf(" dynamic (depending on the options)\n"); > diff --git a/fftools/cmdutils.h b/fftools/cmdutils.h > index f460cb028e..57db531f5c 100644 > --- a/fftools/cmdutils.h > +++ b/fftools/cmdutils.h > @@ -633,8 +633,6 @@ void *grow_array(void *array, int elem_size, int *size, int new_size); > */ > void *allocate_array_elem(void *array, size_t elem_size, int *nb_elems); > > -#define media_type_string av_get_media_type_string > - > #define GROW_ARRAY(array, nb_elems)\ > array = grow_array(array, sizeof(*array), &nb_elems, nb_elems + 1) > > diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c > index 9a3fdc636d..eaca897aec 100644 > --- a/fftools/ffmpeg.c > +++ b/fftools/ffmpeg.c > @@ -1606,7 +1606,7 @@ static void print_final_stats(int64_t total_size) > total_packets += ist->nb_packets; > > av_log(NULL, AV_LOG_VERBOSE, " Input stream #%d:%d (%s): ", > - i, j, media_type_string(type)); > + i, j, av_get_media_type_string(type)); > av_log(NULL, AV_LOG_VERBOSE, "%"PRIu64" packets read (%"PRIu64" bytes); ", > ist->nb_packets, ist->data_size); > > @@ -1640,7 +1640,7 @@ static void print_final_stats(int64_t total_size) > total_packets += ost->packets_written; > > av_log(NULL, AV_LOG_VERBOSE, " Output stream #%d:%d (%s): ", > - i, j, media_type_string(type)); > + i, j, av_get_media_type_string(type)); > if (ost->encoding_needed) { > av_log(NULL, AV_LOG_VERBOSE, "%"PRIu64" frames encoded", > ost->frames_encoded); LGTM. - Andreas _______________________________________________ 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".