[FFmpeg-devel] [PATCH] avcodec/allcodecs: Don't include libx264 twice in the list of codecs

[Andreas Rheinhardt]

Since a247ac640df3da573cd661065bf53f37863e2b46, allcodecs.c contained
two lines that matched the regex used by find_filters_extern in
configure; as a result, libx264 appeared twice the list of codecs
(if enabled).

Fix this by using only one matching line by adding a preprocessor define
for the part that differed in the two old lines: The const qualifier.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at outlook.com>
---
 libavcodec/allcodecs.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c
index 0b15b59364..a68bbd413e 100644
--- a/libavcodec/allcodecs.c
+++ b/libavcodec/allcodecs.c
@@ -766,10 +766,11 @@ extern const AVCodec ff_libx262_encoder;
 #if CONFIG_LIBX264_ENCODER
 #include <x264.h>
 #if X264_BUILD < 153
-extern AVCodec ff_libx264_encoder;
+#define X264_CONST
 #else
-extern const AVCodec ff_libx264_encoder;
+#define X264_CONST const
 #endif
+extern X264_CONST AVCodec ff_libx264_encoder;
 #endif
 extern const AVCodec ff_libx264rgb_encoder;
 extern AVCodec ff_libx265_encoder;
-- 
2.27.0