The branch, master has been updated
via fa959bb135bf95edc0f4bcc7ab8c327532f64694 (commit)
via 25968dbb056a1066296a005e2d24545c28a4fa8c (commit)
from 8a322c956f3808a7199aef9b63a187af17c0a372 (commit)
- Log -----------------------------------------------------------------
commit fa959bb135bf95edc0f4bcc7ab8c327532f64694
Author: Andreas Rheinhardt <[email protected]>
AuthorDate: Sat Nov 1 18:48:17 2025 +0100
Commit: Andreas Rheinhardt <[email protected]>
CommitDate: Sat Nov 1 18:48:17 2025 +0100
avcodec/parsers: Silence deprecation warnings
Slipped through because Clang (in contrast to GCC) does not warn about
this.
Signed-off-by: Andreas Rheinhardt <[email protected]>
diff --git a/libavcodec/parsers.c b/libavcodec/parsers.c
index c3460a3b86..cae1f7213e 100644
--- a/libavcodec/parsers.c
+++ b/libavcodec/parsers.c
@@ -22,8 +22,11 @@
#include "parser_internal.h"
#if FF_API_PARSER_PRIVATE
+#include "libavutil/internal.h"
#include <assert.h>
#include <stddef.h>
+
+FF_DISABLE_DEPRECATION_WARNINGS
#define CHECK_OFFSET(field, public_prefix)
static_assert(offsetof(FFCodecParser, field) == offsetof(FFCodecParser,
p.public_prefix ## field), "Wrong offsets")
CHECK_OFFSET(codec_ids,);
CHECK_OFFSET(priv_data_size,);
@@ -31,6 +34,7 @@ CHECK_OFFSET(init, parser_);
CHECK_OFFSET(parse, parser_);
CHECK_OFFSET(close, parser_);
CHECK_OFFSET(split,);
+FF_ENABLE_DEPRECATION_WARNINGS
#endif
extern const FFCodecParser ff_aac_parser;
commit 25968dbb056a1066296a005e2d24545c28a4fa8c
Author: Andreas Rheinhardt <[email protected]>
AuthorDate: Sat Nov 1 18:41:27 2025 +0100
Commit: Andreas Rheinhardt <[email protected]>
CommitDate: Sat Nov 1 18:41:27 2025 +0100
avcodec/parser_internal: Rename PASSTHROUGH macro to avoid name conflict
wingdi.h defines its own PASSTHROUGH and it is included implicitly
by the VC-1 parser (which is mpegvideo-based and therefore includes
a lot of stuff).
Signed-off-by: Andreas Rheinhardt <[email protected]>
diff --git a/libavcodec/parser_internal.h b/libavcodec/parser_internal.h
index e366b5576a..fa9af971c1 100644
--- a/libavcodec/parser_internal.h
+++ b/libavcodec/parser_internal.h
@@ -67,9 +67,9 @@ static inline const FFCodecParser *ffcodecparser(const
AVCodecParser *parser)
#define CHECK_FOR_TOO_MANY_IDS(...) AV_JOIN(EIGTH_ARG(__VA_ARGS__, NO, NO, NO,
NO, NO, NO, NO, NO), _FAIL)
// For compatibility with MSVC's old, spec-incompliant preprocessor.
-#define PASSTHROUGH(...) __VA_ARGS__
+#define FF_MSVC_EXPAND(...) __VA_ARGS__
#define FIRST_SEVEN2(a,b,c,d,e,f,g,...) a,b,c,d,e,f,g
-#define FIRST_SEVEN(...) PASSTHROUGH(FIRST_SEVEN2(__VA_ARGS__))
+#define FIRST_SEVEN(...) FF_MSVC_EXPAND(FIRST_SEVEN2(__VA_ARGS__))
#define TIMES_SEVEN(a) a,a,a,a,a,a,a
#if FF_API_PARSER_PRIVATE
-----------------------------------------------------------------------
Summary of changes:
libavcodec/parser_internal.h | 4 ++--
libavcodec/parsers.c | 4 ++++
2 files changed, 6 insertions(+), 2 deletions(-)
hooks/post-receive
--
_______________________________________________
ffmpeg-cvslog mailing list -- [email protected]
To unsubscribe send an email to [email protected]
