avcodec: Remove FF_API_PARSER_CODECID
The parser API was scheduled to use enum AVCodecID
in commit 8a322c956f
on 2025-11-01. The switch is made now despite this
being fairly recently because it involves no deprecation
and therefore no change from our downstreams at all.
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
@@ -2761,11 +2761,7 @@ typedef struct AVCodecParserContext {
|
||||
} AVCodecParserContext;
|
||||
|
||||
typedef struct AVCodecParser {
|
||||
#if FF_API_PARSER_CODECID
|
||||
int codec_ids[7]; /* several codec IDs are permitted */
|
||||
#else
|
||||
enum AVCodecID codec_ids[7]; /* several codec IDs are permitted */
|
||||
#endif
|
||||
#if FF_API_PARSER_PRIVATE
|
||||
/*****************************************************************
|
||||
* All fields below this line are not part of the public API. They
|
||||
@@ -2803,11 +2799,7 @@ typedef struct AVCodecParser {
|
||||
*/
|
||||
const AVCodecParser *av_parser_iterate(void **opaque);
|
||||
|
||||
#if FF_API_PARSER_CODECID
|
||||
AVCodecParserContext *av_parser_init(int codec_id);
|
||||
#else
|
||||
AVCodecParserContext *av_parser_init(enum AVCodecID codec_id);
|
||||
#endif
|
||||
|
||||
/**
|
||||
* Parse a packet.
|
||||
|
||||
@@ -32,11 +32,7 @@
|
||||
#include "parser.h"
|
||||
#include "parser_internal.h"
|
||||
|
||||
#if FF_API_PARSER_CODECID
|
||||
av_cold AVCodecParserContext *av_parser_init(int codec_id)
|
||||
#else
|
||||
av_cold AVCodecParserContext *av_parser_init(enum AVCodecID codec_id)
|
||||
#endif
|
||||
{
|
||||
AVCodecParserContext *s = NULL;
|
||||
const AVCodecParser *parser;
|
||||
|
||||
@@ -28,11 +28,7 @@
|
||||
#if FF_API_PARSER_PRIVATE
|
||||
typedef union FFCodecParser {
|
||||
struct {
|
||||
#if FF_API_PARSER_CODECID
|
||||
int codec_ids[7]; /* several codec IDs are permitted */
|
||||
#else
|
||||
enum AVCodecID codec_ids[7]; /* several codec IDs are permitted */
|
||||
#endif
|
||||
int priv_data_size;
|
||||
int (*init)(AVCodecParserContext *s);
|
||||
int (*parse)(AVCodecParserContext *s,
|
||||
|
||||
@@ -47,7 +47,6 @@
|
||||
#define FF_API_NVDEC_OLD_PIX_FMTS (LIBAVCODEC_VERSION_MAJOR < 63)
|
||||
|
||||
#define FF_API_PARSER_PRIVATE (LIBAVCODEC_VERSION_MAJOR < 63)
|
||||
#define FF_API_PARSER_CODECID (LIBAVCODEC_VERSION_MAJOR < 63)
|
||||
|
||||
#define FF_API_MJPEG_EXTERN_HUFF (LIBAVCODEC_VERSION_MAJOR < 63)
|
||||
#define FF_API_NVENC_H264_MAIN (LIBAVCODEC_VERSION_MAJOR < 63)
|
||||
|
||||
Reference in New Issue
Block a user