ffmpeg | branch: master | James Almer <jamr...@gmail.com> | Sun Feb 11 23:08:48 2018 -0300| [35347e7e9b2769166ce99cd4c4789dcf2ac463a9] | committer: James Almer
Merge commit '4cf84e254ae75b524e1cacae499a97d7cc9e5906' * commit '4cf84e254ae75b524e1cacae499a97d7cc9e5906': Drop some unnecessary config.h #includes Merged-by: James Almer <jamr...@gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=35347e7e9b2769166ce99cd4c4789dcf2ac463a9 --- 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 318619316c..540135fbc9 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 9c851bf132..beb19d6d55 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 cf1b9cc516..2ee3f9323a 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 eb64ed5fcd..1d6cc65dc4 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 b8bf1e5396..37122d1c5f 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 0744157c87..36973a54ea 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 7f4e5d08bb..937c697fa0 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" ====================================================================== _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
