These inclusions are not necessary, as cpu.h is already included wherever it is needed (via direct inclusion or via the arch-specific headers). Also remove other unnecessary cpu.h inclusions from ordinary non-headers.
Unified · Split
| @@ -27,7 +27,6 @@ · 26 unmodified lines | |||
| 27 | 27 | ||
| 28 | #define UNCHECKED_BITSTREAM_READER 1 | 28 | #define UNCHECKED_BITSTREAM_READER 1 |
| 29 | 29 | ||
| 30 | #include "libavutil/cpu.h" | ||
| 31 | #include "libavutil/video_enc_params.h" | 30 | #include "libavutil/video_enc_params.h" |
| 32 | 31 | ||
| 33 | #include "avcodec.h" | 32 | #include "avcodec.h" |
| @@ -30,7 +30,6 @@ · 29 unmodified lines | |||
| 30 | #include <xvid.h> | 30 | #include <xvid.h> |
| 31 | 31 | ||
| 32 | #include "libavutil/avassert.h" | 32 | #include "libavutil/avassert.h" |
| 33 | #include "libavutil/cpu.h" | ||
| 34 | #include "libavutil/file.h" | 33 | #include "libavutil/file.h" |
| 35 | #include "libavutil/internal.h" | 34 | #include "libavutil/internal.h" |
| 36 | #include "libavutil/intreadwrite.h" | 35 | #include "libavutil/intreadwrite.h" |
| @@ -25,7 +25,6 @@ · 24 unmodified lines | |||
| 25 | */ | 25 | */ |
| 26 | 26 | ||
| 27 | #include "libavutil/attributes.h" | 27 | #include "libavutil/attributes.h" |
| 28 | #include "libavutil/cpu.h" | ||
| 29 | #include "libavutil/mem.h" | 28 | #include "libavutil/mem.h" |
| 30 | #include "libavutil/mem_internal.h" | 29 | #include "libavutil/mem_internal.h" |
| 31 | #include "libavutil/x86/asm.h" | 30 | #include "libavutil/x86/asm.h" |
| @@ -24,7 +24,6 @@ · 23 unmodified lines | |||
| 24 | #include "config.h" | 24 | #include "config.h" |
| 25 | 25 | ||
| 26 | #include "libavutil/common.h" | 26 | #include "libavutil/common.h" |
| 27 | #include "libavutil/cpu.h" | ||
| 28 | #include "libavutil/mem.h" | 27 | #include "libavutil/mem.h" |
| 29 | #include "libavutil/thread.h" | 28 | #include "libavutil/thread.h" |
| 30 | #include "libavutil/slicethread.h" | 29 | #include "libavutil/slicethread.h" |
| @@ -34,7 +34,6 @@ · 33 unmodified lines | |||
| 34 | 34 | ||
| 35 | #include "libavutil/imgutils.h" | 35 | #include "libavutil/imgutils.h" |
| 36 | #include "libavutil/common.h" | 36 | #include "libavutil/common.h" |
| 37 | #include "libavutil/cpu.h" | ||
| 38 | #include "libavutil/mem_internal.h" | 37 | #include "libavutil/mem_internal.h" |
| 39 | #include "libavutil/opt.h" | 38 | #include "libavutil/opt.h" |
| 40 | #include "libavutil/pixdesc.h" | 39 | #include "libavutil/pixdesc.h" |
| @@ -20,7 +20,6 @@ · 19 unmodified lines | |||
| 20 | 20 | ||
| 21 | #include <float.h> /* FLT_MAX */ | 21 | #include <float.h> /* FLT_MAX */ |
| 22 | 22 | ||
| 23 | #include "libavutil/cpu.h" | ||
| 24 | #include "libavutil/common.h" | 23 | #include "libavutil/common.h" |
| 25 | #include "libavutil/opt.h" | 24 | #include "libavutil/opt.h" |
| 26 | #include "internal.h" | 25 | #include "internal.h" |
| @@ -20,7 +20,6 @@ · 19 unmodified lines | |||
| 20 | */ | 20 | */ |
| 21 | 21 | ||
| 22 | #include "libavutil/avassert.h" | 22 | #include "libavutil/avassert.h" |
| 23 | #include "libavutil/cpu.h" | ||
| 24 | #include "libavutil/common.h" | 23 | #include "libavutil/common.h" |
| 25 | #include "libavutil/pixdesc.h" | 24 | #include "libavutil/pixdesc.h" |
| 26 | #include "libavutil/imgutils.h" | 25 | #include "libavutil/imgutils.h" |
| @@ -40,7 +40,6 @@ · 39 unmodified lines | |||
| 40 | #include "config.h" | 40 | #include "config.h" |
| 41 | #include "attributes.h" | 41 | #include "attributes.h" |
| 42 | #include "timer.h" | 42 | #include "timer.h" |
| 43 | #include "cpu.h" | ||
| 44 | #include "dict.h" | 43 | #include "dict.h" |
| 45 | #include "macros.h" | 44 | #include "macros.h" |
| 46 | #include "pixfmt.h" | 45 | #include "pixfmt.h" |
| @@ -30,7 +30,6 @@ · 29 unmodified lines | |||
| 30 | 30 | ||
| 31 | 31 | ||
| 32 | #include "swresample_internal.h" | 32 | #include "swresample_internal.h" |
| 33 | #include "libavutil/cpu.h" | ||
| 34 | 33 | ||
| 35 | 34 | ||
| 36 | typedef void (conv_func_type)(uint8_t *po, const uint8_t *pi, int is, int os, uint8_t *end); | 35 | typedef void (conv_func_type)(uint8_t *po, const uint8_t *pi, int is, int os, uint8_t *end); |
| @@ -25,7 +25,6 @@ · 24 unmodified lines | |||
| 25 | 25 | ||
| 26 | #include "libavutil/avutil.h" | 26 | #include "libavutil/avutil.h" |
| 27 | #include "libavutil/bswap.h" | 27 | #include "libavutil/bswap.h" |
| 28 | #include "libavutil/cpu.h" | ||
| 29 | #include "libavutil/intreadwrite.h" | 28 | #include "libavutil/intreadwrite.h" |
| 30 | #include "libavutil/mathematics.h" | 29 | #include "libavutil/mathematics.h" |
| 31 | #include "libavutil/pixdesc.h" | 30 | #include "libavutil/pixdesc.h" |
| @@ -27,7 +27,6 @@ · 26 unmodified lines | |||
| 27 | #include "libavutil/avutil.h" | 27 | #include "libavutil/avutil.h" |
| 28 | #include "libavutil/avassert.h" | 28 | #include "libavutil/avassert.h" |
| 29 | #include "libavutil/bswap.h" | 29 | #include "libavutil/bswap.h" |
| 30 | #include "libavutil/cpu.h" | ||
| 31 | #include "libavutil/intreadwrite.h" | 30 | #include "libavutil/intreadwrite.h" |
| 32 | #include "libavutil/mathematics.h" | 31 | #include "libavutil/mathematics.h" |
| 33 | #include "libavutil/mem_internal.h" | 32 | #include "libavutil/mem_internal.h" |
| @@ -27,7 +27,6 @@ · 26 unmodified lines | |||
| 27 | #include "swscale_internal.h" | 27 | #include "swscale_internal.h" |
| 28 | #include "rgb2rgb.h" | 28 | #include "rgb2rgb.h" |
| 29 | #include "libavutil/intreadwrite.h" | 29 | #include "libavutil/intreadwrite.h" |
| 30 | #include "libavutil/cpu.h" | ||
| 31 | #include "libavutil/avutil.h" | 30 | #include "libavutil/avutil.h" |
| 32 | #include "libavutil/mathematics.h" | 31 | #include "libavutil/mathematics.h" |
| 33 | #include "libavutil/mem_internal.h" | 32 | #include "libavutil/mem_internal.h" |
| @@ -27,7 +27,6 @@ · 26 unmodified lines | |||
| 27 | #include <stdlib.h> | 27 | #include <stdlib.h> |
| 28 | #include <inttypes.h> | 28 | #include <inttypes.h> |
| 29 | 29 | ||
| 30 | #include "libavutil/cpu.h" | ||
| 31 | #include "libavutil/bswap.h" | 30 | #include "libavutil/bswap.h" |
| 32 | #include "config.h" | 31 | #include "config.h" |
| 33 | #include "rgb2rgb.h" | 32 | #include "rgb2rgb.h" |