[FFmpeg-devel] [PATCH 1/2] avcodec/rv34_parser: Merge RV30 and RV40 parsers

[Andreas Rheinhardt]

James Almer:
> On 9/4/2023 10:44 AM, Andreas Rheinhardt wrote:
>> They do mostly the same.
>>
>> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at outlook.com>
>> ---
>>   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;
> 
> This afaik will break command lines like "--disable-parsers
> --enable-parser=rv30".
> I don't particularly care, or think anyone will care, but letting you
> know just in case.
> 

I am aware of that; I also don't care. AFAIK we don't give guarantees on
that.

- Andreas