diff mbox series

[FFmpeg-devel,05/17] avcodec/avcodec: Don't include cpu.h

Message ID HE1PR0301MB21547927558B81AAF2FA84148F319@HE1PR0301MB2154.eurprd03.prod.outlook.com
State Accepted
Headers show
Series [FFmpeg-devel,01/17] avcodec/avcodec: Stop including bsf.h in avcodec.h
Related show

Checks

Context Check Description
andriy/x86_make success Make finished
andriy/x86_make_fate success Make fate finished
andriy/PPC64_make success Make finished
andriy/PPC64_make_fate success Make fate finished

Commit Message

Andreas Rheinhardt June 14, 2021, 10:41 p.m. UTC
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(-)
diff mbox series

Patch

diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 5457f47bd0..2304f6d6bb 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -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"
diff --git a/libavcodec/frame_thread_encoder.c b/libavcodec/frame_thread_encoder.c
index b3e571f4b0..9cabfc495f 100644
--- a/libavcodec/frame_thread_encoder.c
+++ b/libavcodec/frame_thread_encoder.c
@@ -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"
diff --git a/libavcodec/libaomdec.c b/libavcodec/libaomdec.c
index 6e7324a832..75ecc08970 100644
--- a/libavcodec/libaomdec.c
+++ b/libavcodec/libaomdec.c
@@ -27,6 +27,7 @@ 
 #include <aom/aomdx.h>
 
 #include "libavutil/common.h"
+#include "libavutil/cpu.h"
 #include "libavutil/imgutils.h"
 
 #include "avcodec.h"
diff --git a/libavcodec/libaomenc.c b/libavcodec/libaomenc.c
index f977fb4889..485a3be48f 100644
--- a/libavcodec/libaomenc.c
+++ b/libavcodec/libaomenc.c
@@ -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"
diff --git a/libavcodec/libdav1d.c b/libavcodec/libdav1d.c
index 50e6200f5d..cd67a906e2 100644
--- a/libavcodec/libdav1d.c
+++ b/libavcodec/libdav1d.c
@@ -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"
diff --git a/libavcodec/libdavs2.c b/libavcodec/libdavs2.c
index 28cad9c5f7..a1672d1c95 100644
--- a/libavcodec/libdavs2.c
+++ b/libavcodec/libdavs2.c
@@ -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"
diff --git a/libavcodec/libuavs3d.c b/libavcodec/libuavs3d.c
index f7e458b356..1d523c8722 100644
--- a/libavcodec/libuavs3d.c
+++ b/libavcodec/libuavs3d.c
@@ -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"
diff --git a/libavcodec/libvpxdec.c b/libavcodec/libvpxdec.c
index f9b4c9f427..42d1b8ab1c 100644
--- a/libavcodec/libvpxdec.c
+++ b/libavcodec/libvpxdec.c
@@ -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"
diff --git a/libavcodec/libvpxenc.c b/libavcodec/libvpxenc.c
index 94932a48da..70c8465358 100644
--- a/libavcodec/libvpxenc.c
+++ b/libavcodec/libvpxenc.c
@@ -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"
diff --git a/libavcodec/tests/aarch64/dct.c b/libavcodec/tests/aarch64/dct.c
index 032a9638f6..9e477328d5 100644
--- a/libavcodec/tests/aarch64/dct.c
+++ b/libavcodec/tests/aarch64/dct.c
@@ -18,6 +18,7 @@ 
 
 #include "config.h"
 
+#include "libavutil/cpu.h"
 #include "libavcodec/aarch64/idct.h"
 
 static const struct algo fdct_tab_arch[] = {
diff --git a/libavcodec/tests/arm/dct.c b/libavcodec/tests/arm/dct.c
index 596d369a99..5f826e84df 100644
--- a/libavcodec/tests/arm/dct.c
+++ b/libavcodec/tests/arm/dct.c
@@ -18,6 +18,7 @@ 
 
 #include "config.h"
 
+#include "libavutil/cpu.h"
 #include "libavcodec/arm/idct.h"
 
 static const struct algo fdct_tab_arch[] = {
diff --git a/libavcodec/tests/motion.c b/libavcodec/tests/motion.c
index d89f9408c2..ef6e1ff309 100644
--- a/libavcodec/tests/motion.c
+++ b/libavcodec/tests/motion.c
@@ -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"
diff --git a/libavcodec/tests/ppc/dct.c b/libavcodec/tests/ppc/dct.c
index d95db525af..e29dbb0aa3 100644
--- a/libavcodec/tests/ppc/dct.c
+++ b/libavcodec/tests/ppc/dct.c
@@ -18,6 +18,7 @@ 
 
 #include "config.h"
 
+#include "libavutil/cpu.h"
 #include "libavcodec/ppc/fdct.h"
 
 static const struct algo fdct_tab_arch[] = {
diff --git a/libavcodec/tests/x86/dct.c b/libavcodec/tests/x86/dct.c
index f5c238efc7..104a0f8e0c 100644
--- a/libavcodec/tests/x86/dct.c
+++ b/libavcodec/tests/x86/dct.c
@@ -18,6 +18,7 @@ 
 
 #include "config.h"
 
+#include "libavutil/cpu.h"
 #include "libavutil/mem_internal.h"
 
 #include "libavcodec/x86/fdct.h"
diff --git a/libavfilter/dnn/dnn_backend_openvino.c b/libavfilter/dnn/dnn_backend_openvino.c
index 709a772a4d..1c7ac0844f 100644
--- a/libavfilter/dnn/dnn_backend_openvino.c
+++ b/libavfilter/dnn/dnn_backend_openvino.c
@@ -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"
diff --git a/libavutil/frame.c b/libavutil/frame.c
index 2ec59b44b1..b0ceaf7145 100644
--- a/libavutil/frame.c
+++ b/libavutil/frame.c
@@ -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"
diff --git a/libavutil/slicethread.c b/libavutil/slicethread.c
index dfbe551ef2..f928a5cf00 100644
--- a/libavutil/slicethread.c
+++ b/libavutil/slicethread.c
@@ -17,6 +17,7 @@ 
  */
 
 #include <stdatomic.h>
+#include "cpu.h"
 #include "slicethread.h"
 #include "mem.h"
 #include "thread.h"
diff --git a/libpostproc/postprocess.c b/libpostproc/postprocess.c
index 8d44165dee..2ca7a3779d 100644
--- a/libpostproc/postprocess.c
+++ b/libpostproc/postprocess.c
@@ -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>
diff --git a/libswresample/resample.c b/libswresample/resample.c
index df49505bf9..f1ec77f54b 100644
--- a/libswresample/resample.c
+++ b/libswresample/resample.c
@@ -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) {
diff --git a/tools/target_dec_fuzzer.c b/tools/target_dec_fuzzer.c
index 0f4d4f1bed..15107caea8 100644
--- a/tools/target_dec_fuzzer.c
+++ b/tools/target_dec_fuzzer.c
@@ -47,6 +47,7 @@ 
 
 #include "config.h"
 #include "libavutil/avassert.h"
+#include "libavutil/cpu.h"
 #include "libavutil/imgutils.h"
 #include "libavutil/intreadwrite.h"