[FFmpeg-cvslog] avcodec/rv34_parser: Merge RV30 and RV40 parsers

[Andreas Rheinhardt]

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt at outlook.com> | Mon Sep  4 15:26:38 2023 +0200| [a7443421f269b957b2a76dbe275ca045468b3f44] | committer: Andreas Rheinhardt

avcodec/rv34_parser: Merge RV30 and RV40 parsers

They do mostly the same.

Reviewed-by: James Almer <jamrial at gmail.com>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at outlook.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a7443421f269b957b2a76dbe275ca045468b3f44
---

 libavcodec/Makefile      |  3 +--
 libavcodec/parsers.c     |  3 +--
 libavcodec/rv34_parser.c | 16 ++--------------
 libavcodec/version.h     |  2 +-
 4 files changed, 5 insertions(+), 19 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
diff --git a/libavcodec/version.h b/libavcodec/version.h
index aa3a484c51..3ade8a8314 100644
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@ -30,7 +30,7 @@
 #include "version_major.h"
 
 #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, \
                                                LIBAVCODEC_VERSION_MINOR, \