On 11/3/2017 1:43 PM, Diego Biurrun wrote:
> ---
>
> Noticed while working on the previous patch, spun off into a separate commit.
>
> libavcodec/thread.h | 1 -
> libavformat/tls.h | 4 ++--
> libavutil/aarch64/cpu.h | 1 -
> libavutil/arm/cpu.h | 1 -
> libavutil/cpu_internal.h | 2 ++
> libavutil/ppc/cpu.h | 1 -
> libavutil/x86/cpu.h | 1 -
> 7 files changed, 4 insertions(+), 7 deletions(-)
>
> diff --git a/libavcodec/thread.h b/libavcodec/thread.h
> index 864e67eb98..b06958de80 100644
> --- a/libavcodec/thread.h
> +++ b/libavcodec/thread.h
> @@ -29,7 +29,6 @@
>
> #include "libavutil/buffer.h"
>
> -#include "config.h"
> #include "avcodec.h"
>
> typedef struct ThreadFrame {
> diff --git a/libavformat/tls.h b/libavformat/tls.h
> index 94f30ab854..846aa8333e 100644
> --- a/libavformat/tls.h
> +++ b/libavformat/tls.h
> @@ -22,10 +22,10 @@
> #ifndef AVFORMAT_TLS_H
> #define AVFORMAT_TLS_H
>
> -#include "config.h"
> -#include "url.h"
> #include "libavutil/opt.h"
>
> +#include "url.h"
> +
> typedef struct TLSShared {
> char *ca_file;
> int verify;
> diff --git a/libavutil/aarch64/cpu.h b/libavutil/aarch64/cpu.h
> index f5b1d89132..0f2531b0dc 100644
> --- a/libavutil/aarch64/cpu.h
> +++ b/libavutil/aarch64/cpu.h
> @@ -19,7 +19,6 @@
> #ifndef AVUTIL_AARCH64_CPU_H
> #define AVUTIL_AARCH64_CPU_H
>
> -#include "config.h"
> #include "libavutil/cpu.h"
> #include "libavutil/cpu_internal.h"
>
> diff --git a/libavutil/arm/cpu.h b/libavutil/arm/cpu.h
> index 127993e5dd..99986d908b 100644
> --- a/libavutil/arm/cpu.h
> +++ b/libavutil/arm/cpu.h
> @@ -19,7 +19,6 @@
> #ifndef AVUTIL_ARM_CPU_H
> #define AVUTIL_ARM_CPU_H
>
> -#include "config.h"
> #include "libavutil/cpu.h"
> #include "libavutil/cpu_internal.h"
>
> diff --git a/libavutil/cpu_internal.h b/libavutil/cpu_internal.h
> index 18c744a983..4c5e1308aa 100644
> --- a/libavutil/cpu_internal.h
> +++ b/libavutil/cpu_internal.h
> @@ -19,6 +19,8 @@
> #ifndef AVUTIL_CPU_INTERNAL_H
> #define AVUTIL_CPU_INTERNAL_H
>
> +#include "config.h"
> +
> #include "cpu.h"
>
> #define CPUEXT_SUFFIX(flags, suffix, cpuext) \
> diff --git a/libavutil/ppc/cpu.h b/libavutil/ppc/cpu.h
> index a8b823f534..bed687125e 100644
> --- a/libavutil/ppc/cpu.h
> +++ b/libavutil/ppc/cpu.h
> @@ -19,7 +19,6 @@
> #ifndef AVUTIL_PPC_CPU_H
> #define AVUTIL_PPC_CPU_H
>
> -#include "config.h"
> #include "libavutil/cpu.h"
> #include "libavutil/cpu_internal.h"
>
> diff --git a/libavutil/x86/cpu.h b/libavutil/x86/cpu.h
> index c0a525dd4e..6373e57db2 100644
> --- a/libavutil/x86/cpu.h
> +++ b/libavutil/x86/cpu.h
> @@ -19,7 +19,6 @@
> #ifndef AVUTIL_X86_CPU_H
> #define AVUTIL_X86_CPU_H
>
> -#include "config.h"
> #include "libavutil/cpu.h"
> #include "libavutil/cpu_internal.h"
Ok if everything still compiles after this, of course.
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
