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

Andreas Rheinhardt git at videolan.org
Fri May 14 03:07:31 EEST 2021

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt at outlook.com> | Tue May 11 03:14:30 2021 +0200| [5a413b392e90a01fce695b4d8d646583ea439362] | committer: Andreas Rheinhardt

avcodec/allcodecs: Don't include libx264 twice in the list of codecs

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>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5a413b392e90a01fce695b4d8d646583ea439362

 libavcodec/allcodecs.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

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

More information about the ffmpeg-cvslog mailing list