From 13fee82660412f908bdab361e884376e0f3b90b6 Mon Sep 17 00:00:00 2001 From: Martin Pulec Date: Wed, 13 Nov 2024 14:40:41 +0100 Subject: [PATCH] lavc_common: insufficient include guard fixed include guard (commit 8b94de582 from yesterday) --- src/libavcodec/lavc_common.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/libavcodec/lavc_common.c b/src/libavcodec/lavc_common.c index 95e48b219..8c9a26712 100644 --- a/src/libavcodec/lavc_common.c +++ b/src/libavcodec/lavc_common.c @@ -354,11 +354,11 @@ get_avpixfmts_names(const enum AVPixelFormat *pixfmts) * * If passed ctx, values such as `strict_std_compliance` may afect the result. */ +#if LIBAVCODEC_VERSION_INT > AV_VERSION_INT(61, 13, 100) static const void * avc_get_supported_config(const AVCodecContext *ctx, const AVCodec *codec, enum AVCodecConfig config) { -#if LIBAVCODEC_VERSION_INT > AV_VERSION_INT(61, 13, 100) const void *ret = NULL; int unused_count = 0; const int rc = avcodec_get_supported_config( @@ -371,10 +371,8 @@ avc_get_supported_config(const AVCodecContext *ctx, const AVCodec *codec, } return ret; -#else - abort(); // cannot reach here (shouldn't be called) -#endif } +#endif ///< @copydoc avc_get_supported_config const enum AVPixelFormat * avc_get_supported_pix_fmts(const AVCodecContext *ctx, const AVCodec *codec)