diff options
| author | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2023-09-04 15:26:38 +0200 |
|---|---|---|
| committer | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2023-09-07 00:27:52 +0200 |
| commit | a7443421f269b957b2a76dbe275ca045468b3f44 (patch) | |
| tree | 8878e10430e97fd3f0ccce2c7e2a4306323abbc6 /libavcodec/rv34_parser.c | |
| parent | 947d51f32a306741f95c3e8c98b9541c3f9626d8 (diff) | |
| download | ffmpeg-a7443421f269b957b2a76dbe275ca045468b3f44.tar.gz | |
avcodec/rv34_parser: Merge RV30 and RV40 parsers
They do mostly the same.
Reviewed-by: James Almer <jamrial@gmail.com>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
Diffstat (limited to 'libavcodec/rv34_parser.c')
| -rw-r--r-- | libavcodec/rv34_parser.c | 16 |
1 files changed, 2 insertions, 14 deletions
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 |