eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-14 11:00:08 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Since a247ac640d, 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@outlook.com>
This commit is contained in:
Andreas Rheinhardt
2021-05-11 03:14:30 +02:00
parent 6ff2aba088
commit 5a413b392e
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libavcodec/allcodecs.c
View File

@@ -766,10 +766,11 @@ extern const AVCodec ff_libx262_encoder;
#if CONFIG_LIBX264_ENCODER #if CONFIG_LIBX264_ENCODER
#include <x264.h> #include <x264.h>
#if X264_BUILD < 153 #if X264_BUILD < 153
extern AVCodec ff_libx264_encoder; #define LIBX264_CONST
#else #else
extern const AVCodec ff_libx264_encoder; #define LIBX264_CONST const
#endif #endif
extern LIBX264_CONST AVCodec ff_libx264_encoder;
#endif #endif
extern const AVCodec ff_libx264rgb_encoder; extern const AVCodec ff_libx264rgb_encoder;
extern AVCodec ff_libx265_encoder; extern AVCodec ff_libx265_encoder;