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 3D86A46C1C for ; Wed, 6 Sep 2023 09:35:33 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4492068C7B5; Wed, 6 Sep 2023 12:35:32 +0300 (EEST) Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2077.outbound.protection.outlook.com [40.92.90.77]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4D58B68C3B8 for ; Wed, 6 Sep 2023 12:35:31 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=AQsFhOdUW3ozPnl/HF7pAD/lgx3XaATPtcXPw6iP36XUyvPC8gLJ+Cpn5aGklhi+vk57bbK9CHBSiEj0l/aKV3o6CmD4O0zi917OdIT3aV0nBw6rToTnG5fRP7K8uyomdvEhpjGSHCAensMt37EW9LSV82cFe9ZUeo/eqtcSmoph2XXBmxpcKV18S/F09ZwSzo1796HiVrbx4rxEuX7plkxGDwP55TIJTYYw9Lc8YnWRBF8u5v+syRQ7WQdL0MbuBAl96kzSdm7I5C/jmdTud1iCGQAfG9ytyTZE3l9UDG94E/oTTDtj5Z3QVD5RicQtHGhIlR1C6XKTrFmmT+k32A== 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=Kj+TaG8tzEVnRdkcNWjFWe5DjKiXT7D2f4fcgN+xUj8=; b=AvnAPxQN5VOIT1gnD83vaRe+We92D8jnT+fNKSxAqQh4mgPBngIM4qMd0XSDzs9luo5AEHb77MWIb8+6LN3z+gM+mwF5OXXYi5WOcGuYuuKgLmzqeOWF1Nz66UdHsnx1Cw6QebCWbG/6unlZ8V3qoyRtjDJPIp/3kxDAQ9xcsL75qkaJ6MCzUFqnEDFb2jder+opIWM+RftuNBp6JwAjpYuCpdiAmzRGoO3O078nrFxiTqgem25YHqtJ58N9654MOoRu9XvCa+IZUZpb0J/g30uG+f2mD64dOK/yRZCHDahVdcIuJfST35kNpPgi0YjqgAN5hhqrSOTWVvCVy36+3w== 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=Kj+TaG8tzEVnRdkcNWjFWe5DjKiXT7D2f4fcgN+xUj8=; b=FPbkmvh3vGOe9vZ4efO2oSpx/d5ThU7YKaxMUfO0rvdh602X/7nGfo4lyWIAZR7coweW55kC/okBsyyTR2mMGx028pTctZXGcBEdVZahtKHaltbIGviBPUgB71yzhfXaIhc5lbTcaMT/cFck1mPsUIINlr3txOym/f0x512weCN3djdsUHZTngOCLPg1vFYuOxD7L+qSxcHDvDJl8vUl07eJoAOUwhvdtOuXwlIQOVXoOr0Qn3JrdLZ1vVjOhAo2DAPC2/hwnE/78v3IgL1zkJ0quJrpkW3vG5QzFyqHwPlrISd8qM34nFc7RJ5qJeSru6+KteAUiw/EycerqSI+TQ== Received: from DU0P250MB0747.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:3cb::16) by PR3P250MB0195.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:17a::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6745.34; Wed, 6 Sep 2023 09:35:29 +0000 Received: from DU0P250MB0747.EURP250.PROD.OUTLOOK.COM ([fe80::e8dd:7fe1:2348:cd62]) by DU0P250MB0747.EURP250.PROD.OUTLOOK.COM ([fe80::e8dd:7fe1:2348:cd62%7]) with mapi id 15.20.6745.030; Wed, 6 Sep 2023 09:35:29 +0000 Message-ID: Date: Wed, 6 Sep 2023 11:36:47 +0200 Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: From: Andreas Rheinhardt In-Reply-To: X-TMN: [eoQItYYNHbBNSnR4lx8ZSc2rx+7TP/vs] X-ClientProxiedBy: FR0P281CA0126.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:97::6) To DU0P250MB0747.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:3cb::16) X-Microsoft-Original-Message-ID: <6b35aeaa-a846-65c8-1a9b-02620ff187ab@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DU0P250MB0747:EE_|PR3P250MB0195:EE_ X-MS-Office365-Filtering-Correlation-Id: 7a95119e-37c8-440f-906e-08dbaebc9b6d X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: WRIzWvqkro+Ms2ZsdzbaKSpoN3dBxVzMm+xo498lempw4UX6lQN1Ksb8bTc0Ex2lCJE7C71zPUJDD3AqC5clXSpzyPYcPNAeje/a+oc5lyEsX4Y3ZF4CTL+qKkB/PwLfnF4B0kNpWBpP8LQMewAWE24w9HBcv0Dn1S/SzGoo2BzMtVKA025M+sZ6ek2C20FUn1qRQ4Jo06cerB6DD7N/uujcr8FKYd97tDtuWEfqrqcewiFI6ho45pdOl387bTCBu2SCNGGD2QsWTlGk0tLU5srGUp4ecyhM2cS4hPfmGqY7z0HnPAMo4Xa/OuSO8bSwdR8C0fyQA8aqzBX2QBzTjlgw7aLc/W/3vFVwtrnlEJnQdP58IhRoN0gVGNtHbRY8T9W3/1wn0PlAEzTYNGJ0V8vEiYxXRSAwIKhUgnrnd3PjCV6OmOxb1gp6JzkEb6iM0rtqisbFbOwqC4HgmS8S+URBDXiE353jFz4wvO+rNaHx4nwJ7AigHKxrTkMbeh7nmezpYTqwIoVwNv8EfPfQIx6XpSjGRbZ+HdtR4ssDpu1Kzdc1m04FttB+9ynD8KZq X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?MS9GTjJxUTh5dWl3RW55emN4WG1zZnVQdDlFNGxjcjViQmo2TDcva1VDd3l2?= =?utf-8?B?VHJDc3pNT0Z1eEgrcVJxeGRucmtvSXN5MDNPNXdvdkU5c3VuaW5iZXhSbXFo?= =?utf-8?B?Zm9YTFpTa2YzRzhsc09KSHVlNFFpMUxMNW9RVFlvcFppVlAvOG9JZFRJKzlh?= =?utf-8?B?N3ZscXZ6dkU4VGhMU0JTaEZUbkpPdHdBU0o1N3pxZHp2elNRTDNramhVemNs?= =?utf-8?B?UXd1UkFMdXhIcTBFM1c4dWpoZFZ2cEtQN0dZZ2dFK0dHV2ZJaWh2ZVk2UG9a?= =?utf-8?B?Mkc5MUYzWGFMemthaGVyeGJNZzJZU01GSkkrYXdhZVVrb3RYWm1nUVppeEUr?= =?utf-8?B?MnNaRUgyelJzREJyT3RUdkxpM0VHc1RjWk5hVmJSWnk5dTg5VERldW1wOUV4?= =?utf-8?B?NHJkYUZWNHVwdFV3bDhFSTluM0pocU4yQmNKOHBNYTJlQkV2VHVwTDJYZ1pn?= =?utf-8?B?YTJBK2tCMXUzMVZXOUErVHdTL0NydnB3dW8xQ3I4ajlBZ1hUbEZMSHRmcFg2?= =?utf-8?B?VUZ4ZmVLQTBLeDRUM3VwSldiWXJCQ25YNWRBb1JDenRlbGRBMVQ1Rld5VU9D?= =?utf-8?B?dnJZamRkcDcza2VDOWV6aHQ2VE5mRytuUy9Wc3lEcXpONElEYkZTenF2OHFW?= =?utf-8?B?YTlCMUJZcFRpVjZsSGM5SGk0REZ0QjN1Z2RCZUJTS3NtbVRaVEhuMGNrcEhj?= =?utf-8?B?bHNnNWRuRE1RWDBjRVpyM0s3K2Vqaklabm5VM1o0TXpXQUFOMllaek5tMjQ0?= =?utf-8?B?czVVdlBiNkhiUjhYb0hINmwycVVhSHhuM0xnSzVhQURaVjM3WlRXSmdIcUZy?= =?utf-8?B?ZTM5RlBmTW8vMjYwMGFGRCtGQS9hcFNLTzQzWnFpWm5OSmRhQUVNWDhUWWRW?= =?utf-8?B?UWFtWnVhcTVEWW0zRllsV3NoZEQyU09GSW9QdWZnL3lGWlJNV29qRTZXSGlX?= =?utf-8?B?RTY0Y29iMkxTMTZTbHlsZXI1cDFOY3JpbXNlWDlBSjNUWTVDb216NHFkNlFO?= =?utf-8?B?SklQcFprRlRPTUdsMWMyYkNRMWUrVFlHOWNMUkVkTi9qRG1tR2duRmxPUlE1?= =?utf-8?B?U1ZjdEdnbzJEUGQxNFJjYkpyNFZHNWszYUlVd3J1dWNGL05ncGNyWSt4V3Zs?= =?utf-8?B?NkJwQytWRmNSTFk5cFRJNWJPYmFRaFR0emhJOWJHQUJtU00yRVlwUkNpeUs3?= =?utf-8?B?WlJTVG85SC9CY3ErM0FsRnpySTBlUlV6L0pMZ0V3ZDhCNVBMZWdmYVQrQVZq?= =?utf-8?B?TkNQOHZvSEJFNVFFQVdjWkZ6ZU95VzNaTlY0K1VXVkl2cndCODJZM2JjV1RV?= =?utf-8?B?YUU3UjdzUEMzV0tyWUM5TEFzMVg5WG5nWjR2bm1JRjRxZzdBWW5nczhoNldx?= =?utf-8?B?MXYzSTV4aG1ZWlJkRXJIazdCbVRYVUNNSjNlN3F1N3VpQkZ5TnNZbDRTdzRa?= =?utf-8?B?ZGl4NHlDSW5iem5JcFppQWxOK1d5N3pNTVRzOFNuNVRsZUJGNEdtU21hUS9C?= =?utf-8?B?MFZFVElIeVdaNkIzMnJNVmovdXpEVE9NTnhsS0lIUHpSZTdYektXSThKWC80?= =?utf-8?B?ZjU4di9lbjYxa0RaRy9sK2V0L0dia3dnUGVHVDlxVmwrVGhZUE9zTjR4WW94?= =?utf-8?B?bU5EcEFIUmhGYzhub3NQbnpmeVVNZnlGc2NVandNcG55alBPazVUdmtocWJP?= =?utf-8?Q?lU4hZ7InzViX6FWxidu1?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7a95119e-37c8-440f-906e-08dbaebc9b6d X-MS-Exchange-CrossTenant-AuthSource: DU0P250MB0747.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Sep 2023 09:35:29.0211 (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: PR3P250MB0195 Subject: Re: [FFmpeg-devel] [PATCH 1/2] avcodec/rv34_parser: Merge RV30 and RV40 parsers 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: Andreas Rheinhardt: > They do mostly the same. > > Signed-off-by: Andreas Rheinhardt > --- > libavcodec/Makefile | 3 +-- > libavcodec/parsers.c | 3 +-- > libavcodec/rv34_parser.c | 16 ++-------------- > 3 files changed, 4 insertions(+), 18 deletions(-) > > diff --git a/libavcodec/Makefile b/libavcodec/Makefile > index 08fd151619..bf3b0a93f9 100644 > --- a/libavcodec/Makefile > +++ b/libavcodec/Makefile > @@ -1203,8 +1203,7 @@ OBJS-$(CONFIG_OPUS_PARSER) += opus_parser.o opus_parse.o \ > OBJS-$(CONFIG_PNG_PARSER) += png_parser.o > OBJS-$(CONFIG_PNM_PARSER) += pnm_parser.o pnm.o > OBJS-$(CONFIG_QOI_PARSER) += qoi_parser.o > -OBJS-$(CONFIG_RV30_PARSER) += rv34_parser.o > -OBJS-$(CONFIG_RV40_PARSER) += rv34_parser.o > +OBJS-$(CONFIG_RV34_PARSER) += rv34_parser.o > OBJS-$(CONFIG_SBC_PARSER) += sbc_parser.o > OBJS-$(CONFIG_SIPR_PARSER) += sipr_parser.o > OBJS-$(CONFIG_TAK_PARSER) += tak_parser.o tak.o > diff --git a/libavcodec/parsers.c b/libavcodec/parsers.c > index a663b9e253..5128009cd4 100644 > --- a/libavcodec/parsers.c > +++ b/libavcodec/parsers.c > @@ -66,8 +66,7 @@ extern const AVCodecParser ff_opus_parser; > extern const AVCodecParser ff_png_parser; > extern const AVCodecParser ff_pnm_parser; > extern const AVCodecParser ff_qoi_parser; > -extern const AVCodecParser ff_rv30_parser; > -extern const AVCodecParser ff_rv40_parser; > +extern const AVCodecParser ff_rv34_parser; > extern const AVCodecParser ff_sbc_parser; > extern const AVCodecParser ff_sipr_parser; > extern const AVCodecParser ff_tak_parser; > diff --git a/libavcodec/rv34_parser.c b/libavcodec/rv34_parser.c > index e17bc8562d..fbc764c64f 100644 > --- a/libavcodec/rv34_parser.c > +++ b/libavcodec/rv34_parser.c > @@ -24,8 +24,6 @@ > * RV30/40 parser > */ > > -#include "config_components.h" > - > #include "parser.h" > #include "libavutil/intreadwrite.h" > > @@ -78,18 +76,8 @@ static int rv34_parse(AVCodecParserContext *s, > return buf_size; > } > > -#if CONFIG_RV30_PARSER > -const AVCodecParser ff_rv30_parser = { > - .codec_ids = { AV_CODEC_ID_RV30 }, > - .priv_data_size = sizeof(RV34ParseContext), > - .parser_parse = rv34_parse, > -}; > -#endif > - > -#if CONFIG_RV40_PARSER > -const AVCodecParser ff_rv40_parser = { > - .codec_ids = { AV_CODEC_ID_RV40 }, > +const AVCodecParser ff_rv34_parser = { > + .codec_ids = { AV_CODEC_ID_RV30, AV_CODEC_ID_RV40 }, > .priv_data_size = sizeof(RV34ParseContext), > .parser_parse = rv34_parse, > }; > -#endif Will apply this patchset tomorrow unless there are objections. - 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".