@@ -31,7 +31,6 @@
#include "libavutil/attributes.h"
#include "libavutil/avutil.h"
#include "libavutil/buffer.h"
-#include "libavutil/cpu.h"
#include "libavutil/dict.h"
#include "libavutil/frame.h"
#include "libavutil/log.h"
@@ -23,6 +23,7 @@
#include "frame_thread_encoder.h"
#include "libavutil/avassert.h"
+#include "libavutil/cpu.h"
#include "libavutil/imgutils.h"
#include "libavutil/opt.h"
#include "libavutil/thread.h"
@@ -27,6 +27,7 @@
#include <aom/aomdx.h>
#include "libavutil/common.h"
+#include "libavutil/cpu.h"
#include "libavutil/imgutils.h"
#include "avcodec.h"
@@ -30,6 +30,7 @@
#include "libavutil/avassert.h"
#include "libavutil/base64.h"
#include "libavutil/common.h"
+#include "libavutil/cpu.h"
#include "libavutil/mathematics.h"
#include "libavutil/opt.h"
#include "libavutil/pixdesc.h"
@@ -22,6 +22,7 @@
#include <dav1d/dav1d.h>
#include "libavutil/avassert.h"
+#include "libavutil/cpu.h"
#include "libavutil/film_grain_params.h"
#include "libavutil/mastering_display_metadata.h"
#include "libavutil/imgutils.h"
@@ -22,6 +22,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include "libavutil/cpu.h"
#include "avcodec.h"
#include "internal.h"
#include "davs2.h"
@@ -24,6 +24,7 @@
#include "libavutil/avassert.h"
#include "libavutil/avutil.h"
#include "libavutil/common.h"
+#include "libavutil/cpu.h"
#include "libavutil/imgutils.h"
#include "libavutil/intreadwrite.h"
#include "libavutil/opt.h"
@@ -29,6 +29,7 @@
#include <vpx/vp8dx.h>
#include "libavutil/common.h"
+#include "libavutil/cpu.h"
#include "libavutil/imgutils.h"
#include "libavutil/intreadwrite.h"
#include "avcodec.h"
@@ -38,6 +38,7 @@
#include "libavutil/avstring.h"
#include "libavutil/base64.h"
#include "libavutil/common.h"
+#include "libavutil/cpu.h"
#include "libavutil/internal.h"
#include "libavutil/intreadwrite.h"
#include "libavutil/mathematics.h"
@@ -18,6 +18,7 @@
#include "config.h"
+#include "libavutil/cpu.h"
#include "libavcodec/aarch64/idct.h"
static const struct algo fdct_tab_arch[] = {
@@ -18,6 +18,7 @@
#include "config.h"
+#include "libavutil/cpu.h"
#include "libavcodec/arm/idct.h"
static const struct algo fdct_tab_arch[] = {
@@ -29,6 +29,7 @@
#include "config.h"
#include "libavcodec/me_cmp.h"
+#include "libavutil/cpu.h"
#include "libavutil/internal.h"
#include "libavutil/lfg.h"
#include "libavutil/mem.h"
@@ -18,6 +18,7 @@
#include "config.h"
+#include "libavutil/cpu.h"
#include "libavcodec/ppc/fdct.h"
static const struct algo fdct_tab_arch[] = {
@@ -18,6 +18,7 @@
#include "config.h"
+#include "libavutil/cpu.h"
#include "libavutil/mem_internal.h"
#include "libavcodec/x86/fdct.h"
@@ -27,6 +27,7 @@
#include "dnn_io_proc.h"
#include "libavformat/avio.h"
#include "libavutil/avassert.h"
+#include "libavutil/cpu.h"
#include "libavutil/opt.h"
#include "libavutil/avstring.h"
#include "libavutil/detection_bbox.h"
@@ -20,6 +20,7 @@
#include "avassert.h"
#include "buffer.h"
#include "common.h"
+#include "cpu.h"
#include "dict.h"
#include "frame.h"
#include "imgutils.h"
@@ -17,6 +17,7 @@
*/
#include <stdatomic.h>
+#include "cpu.h"
#include "slicethread.h"
#include "mem.h"
#include "thread.h"
@@ -76,6 +76,7 @@ try to unroll inner for(x=0 ... loop to avoid these damn if(x ... checks
#include "config.h"
#include "libavutil/avutil.h"
#include "libavutil/avassert.h"
+#include "libavutil/cpu.h"
#include "libavutil/intreadwrite.h"
#include <inttypes.h>
#include <stdio.h>
@@ -27,6 +27,7 @@
*/
#include "libavutil/avassert.h"
+#include "libavutil/cpu.h"
#include "resample.h"
static inline double eval_poly(const double *coeff, int size, double x) {
@@ -47,6 +47,7 @@
#include "config.h"
#include "libavutil/avassert.h"
+#include "libavutil/cpu.h"
#include "libavutil/imgutils.h"
#include "libavutil/intreadwrite.h"
It is not used here at all; instead, add it where it is used without including it or any of the arch-specific CPU headers. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> --- libavcodec/avcodec.h | 1 - libavcodec/frame_thread_encoder.c | 1 + libavcodec/libaomdec.c | 1 + libavcodec/libaomenc.c | 1 + libavcodec/libdav1d.c | 1 + libavcodec/libdavs2.c | 1 + libavcodec/libuavs3d.c | 1 + libavcodec/libvpxdec.c | 1 + libavcodec/libvpxenc.c | 1 + libavcodec/tests/aarch64/dct.c | 1 + libavcodec/tests/arm/dct.c | 1 + libavcodec/tests/motion.c | 1 + libavcodec/tests/ppc/dct.c | 1 + libavcodec/tests/x86/dct.c | 1 + libavfilter/dnn/dnn_backend_openvino.c | 1 + libavutil/frame.c | 1 + libavutil/slicethread.c | 1 + libpostproc/postprocess.c | 1 + libswresample/resample.c | 1 + tools/target_dec_fuzzer.c | 1 + 20 files changed, 19 insertions(+), 1 deletion(-)