diff options
| author | James Almer <jamrial@gmail.com> | 2018-02-11 23:08:48 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2018-02-11 23:08:48 -0300 |
| commit | 35347e7e9b2769166ce99cd4c4789dcf2ac463a9 (patch) | |
| tree | e61950ee24da1de8020746cf35ec64f9a7d2aa93 | |
| parent | 8a15ad8a175cb97d6c1102b777f28e4d20846fec (diff) | |
| parent | 4cf84e254ae75b524e1cacae499a97d7cc9e5906 (diff) | |
| download | ffmpeg-35347e7e9b2769166ce99cd4c4789dcf2ac463a9.tar.gz | |
Merge commit '4cf84e254ae75b524e1cacae499a97d7cc9e5906'
* commit '4cf84e254ae75b524e1cacae499a97d7cc9e5906':
Drop some unnecessary config.h #includes
Merged-by: James Almer <jamrial@gmail.com>
| -rw-r--r-- | libavcodec/thread.h | 1 | ||||
| -rw-r--r-- | libavformat/tls.h | 4 | ||||
| -rw-r--r-- | libavutil/aarch64/cpu.h | 1 | ||||
| -rw-r--r-- | libavutil/arm/cpu.h | 1 | ||||
| -rw-r--r-- | libavutil/cpu_internal.h | 2 | ||||
| -rw-r--r-- | libavutil/ppc/cpu.h | 1 | ||||
| -rw-r--r-- | 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" |