| Message ID | GV1SPRMB0037354A54EEA6C8D17BA48D8F1F2@GV1SPRMB0037.EURP250.PROD.OUTLOOK.COM |
|---|---|
| State | Accepted |
| Commit | 2f8bf90054a5f7455f35b8705163f81c4413d779 |
| Headers | show |
| Series | [FFmpeg-devel] avcodec/allcodecs: Remove LIBX264_CONST | expand |
Andreas Rheinhardt: > Possible since 71669f2ad54d92a40dc2748cd5bd6ca4c8651231. > > Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> > --- > libavcodec/allcodecs.c | 11 +---------- > 1 file changed, 1 insertion(+), 10 deletions(-) > > diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c > index f4705651fb..b102a8069e 100644 > --- a/libavcodec/allcodecs.c > +++ b/libavcodec/allcodecs.c > @@ -28,7 +28,6 @@ > #include <string.h> > > #include "config.h" > -#include "config_components.h" > #include "libavutil/thread.h" > #include "codec.h" > #include "codec_id.h" > @@ -805,15 +804,7 @@ extern const FFCodec ff_libvpx_vp9_decoder; > extern const FFCodec ff_libwebp_anim_encoder; > extern const FFCodec ff_libwebp_encoder; > extern const FFCodec ff_libx262_encoder; > -#if CONFIG_LIBX264_ENCODER > -#include <x264.h> > -#if X264_BUILD < 153 > -#define LIBX264_CONST > -#else > -#define LIBX264_CONST const > -#endif > -extern LIBX264_CONST FFCodec ff_libx264_encoder; > -#endif > +extern const FFCodec ff_libx264_encoder; > extern const FFCodec ff_libx264rgb_encoder; > extern FFCodec ff_libx265_encoder; > extern const FFCodec ff_libxeve_encoder; Will apply this patch tomorrow unless there are objections. - Andreas
diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c index f4705651fb..b102a8069e 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c @@ -28,7 +28,6 @@ #include <string.h> #include "config.h" -#include "config_components.h" #include "libavutil/thread.h" #include "codec.h" #include "codec_id.h" @@ -805,15 +804,7 @@ extern const FFCodec ff_libvpx_vp9_decoder; extern const FFCodec ff_libwebp_anim_encoder; extern const FFCodec ff_libwebp_encoder; extern const FFCodec ff_libx262_encoder; -#if CONFIG_LIBX264_ENCODER -#include <x264.h> -#if X264_BUILD < 153 -#define LIBX264_CONST -#else -#define LIBX264_CONST const -#endif -extern LIBX264_CONST FFCodec ff_libx264_encoder; -#endif +extern const FFCodec ff_libx264_encoder; extern const FFCodec ff_libx264rgb_encoder; extern FFCodec ff_libx265_encoder; extern const FFCodec ff_libxeve_encoder;
Possible since 71669f2ad54d92a40dc2748cd5bd6ca4c8651231. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> --- libavcodec/allcodecs.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-)