virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-11-23 21:54:53 +02:00
Code Issues Releases Activity

avcodec/avcodec: Schedule parser API to use enum AVCodecID for codec ids

Browse Source 
Reviewed-by: James Almer <jamrial@gmail.com>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt
2025-10-26 17:40:02 +01:00
parent 7c43cc4cb7
commit 8a322c956f
6 changed files with 22 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
doc/APIchanges
View File

@@ -2,6 +2,10 @@ The last version increases of all libraries were on 2025-03-28
API changes, most recent first:
2025-11-01 - xxxxxxxxxx - lavc 62.19.100 - avcodec.h
Schedule AVCodecParser and av_parser_init() to use enum AVCodecID
for codec ids on the next major version bump.
2025-11-01 - xxxxxxxxxx - lavc 62.18.100 - avcodec.h
Deprecate AVCodecParser fields priv_data_size, parser_init,
parser_parse, parser_close, and split with no replacement.

8
libavcodec/avcodec.h
View File

@@ -2732,7 +2732,11 @@ 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
@@ -2770,7 +2774,11 @@ 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.

4
libavcodec/parser.c
View File

@@ -31,7 +31,11 @@
#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;

4
libavcodec/parser_internal.h
View File

@@ -28,7 +28,11 @@
#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,

2
libavcodec/version.h
View File

@@ -29,7 +29,7 @@
#include "version_major.h"
#define LIBAVCODEC_VERSION_MINOR 18
#define LIBAVCODEC_VERSION_MINOR 19
#define LIBAVCODEC_VERSION_MICRO 100
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \

1
libavcodec/version_major.h
View File

@@ -46,6 +46,7 @@
#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)
// reminder to remove the OMX encoder on next major bump
#define FF_CODEC_OMX (LIBAVCODEC_VERSION_MAJOR < 63)