wrapper/FFmpeg
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

avcodec/rv34_parser: Merge RV30 and RV40 parsers

Browse source 
They do mostly the same.

Reviewed-by: James Almer <jamrial@gmail.com>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt 2023-09-04 15:26:38 +02:00
parent 947d51f32a
commit a7443421f2
4 changed files with 5 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

3
libavcodec/Makefile
View file

@ -1203,8 +1203,7 @@ OBJS-$(CONFIG_OPUS_PARSER) += opus_parser.o opus_parse.o \
OBJS-$(CONFIG_PNG_PARSER) += png_parser.o OBJS-$(CONFIG_PNG_PARSER) += png_parser.o
OBJS-$(CONFIG_PNM_PARSER) += pnm_parser.o pnm.o OBJS-$(CONFIG_PNM_PARSER) += pnm_parser.o pnm.o
OBJS-$(CONFIG_QOI_PARSER) += qoi_parser.o OBJS-$(CONFIG_QOI_PARSER) += qoi_parser.o
OBJS-$(CONFIG_RV30_PARSER) += rv34_parser.o OBJS-$(CONFIG_RV34_PARSER) += rv34_parser.o
OBJS-$(CONFIG_RV40_PARSER) += rv34_parser.o
OBJS-$(CONFIG_SBC_PARSER) += sbc_parser.o OBJS-$(CONFIG_SBC_PARSER) += sbc_parser.o
OBJS-$(CONFIG_SIPR_PARSER) += sipr_parser.o OBJS-$(CONFIG_SIPR_PARSER) += sipr_parser.o
OBJS-$(CONFIG_TAK_PARSER) += tak_parser.o tak.o OBJS-$(CONFIG_TAK_PARSER) += tak_parser.o tak.o

3
libavcodec/parsers.c
View file

@ -66,8 +66,7 @@ extern const AVCodecParser ff_opus_parser;
extern const AVCodecParser ff_png_parser; extern const AVCodecParser ff_png_parser;
extern const AVCodecParser ff_pnm_parser; extern const AVCodecParser ff_pnm_parser;
extern const AVCodecParser ff_qoi_parser; extern const AVCodecParser ff_qoi_parser;
extern const AVCodecParser ff_rv30_parser; extern const AVCodecParser ff_rv34_parser;
extern const AVCodecParser ff_rv40_parser;
extern const AVCodecParser ff_sbc_parser; extern const AVCodecParser ff_sbc_parser;
extern const AVCodecParser ff_sipr_parser; extern const AVCodecParser ff_sipr_parser;
extern const AVCodecParser ff_tak_parser; extern const AVCodecParser ff_tak_parser;

16
libavcodec/rv34_parser.c
View file

@ -24,8 +24,6 @@
* RV30/40 parser * RV30/40 parser
*/ */
#include "config_components.h"
#include "parser.h" #include "parser.h"
#include "libavutil/intreadwrite.h" #include "libavutil/intreadwrite.h"
@ -78,18 +76,8 @@ static int rv34_parse(AVCodecParserContext *s,
return buf_size; return buf_size;
} }
#if CONFIG_RV30_PARSER const AVCodecParser ff_rv34_parser = {
const AVCodecParser ff_rv30_parser = { .codec_ids = { AV_CODEC_ID_RV30, AV_CODEC_ID_RV40 },
.codec_ids = { AV_CODEC_ID_RV30 },
.priv_data_size = sizeof(RV34ParseContext), .priv_data_size = sizeof(RV34ParseContext),
.parser_parse = rv34_parse, .parser_parse = rv34_parse,
}; };
#endif
#if CONFIG_RV40_PARSER
const AVCodecParser ff_rv40_parser = {
.codec_ids = { AV_CODEC_ID_RV40 },
.priv_data_size = sizeof(RV34ParseContext),
.parser_parse = rv34_parse,
};
#endif

2
libavcodec/version.h
View file

@ -30,7 +30,7 @@
#include "version_major.h" #include "version_major.h"
#define LIBAVCODEC_VERSION_MINOR 25 #define LIBAVCODEC_VERSION_MINOR 25
#define LIBAVCODEC_VERSION_MICRO 101 #define LIBAVCODEC_VERSION_MICRO 102
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
LIBAVCODEC_VERSION_MINOR, \ LIBAVCODEC_VERSION_MINOR, \