[FFmpeg-devel] [PATCH] avcodec/allcodecs: Remove LIBX264_CONST

[FFmpeg-devel] [PATCH] avcodec/allcodecs: Remove LIBX264_CONST

[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;
-- 
2.40.1

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

Re: [FFmpeg-devel] [PATCH] avcodec/allcodecs: Remove LIBX264_CONST

[Andreas Rheinhardt]

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

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".