[FFmpeg-cvslog] avutil/internal, swresample/audioconvert: Remove cpu.h inclusions

Andreas Rheinhardt git at videolan.org
Thu Jul 22 17:56:12 EEST 2021


ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt at outlook.com> | Sat Jun 12 23:00:12 2021 +0200| [2c05ee092bda386cfaa6c0cd231ec64987335cfd] | committer: Andreas Rheinhardt

avutil/internal, swresample/audioconvert: Remove cpu.h inclusions

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.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at outlook.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2c05ee092bda386cfaa6c0cd231ec64987335cfd
---

 libavcodec/h263dec.c          | 1 -
 libavcodec/libxvid.c          | 1 -
 libavcodec/x86/vc1dsp_mmx.c   | 1 -
 libavfilter/pthread.c         | 1 -
 libavfilter/vf_gradfun.c      | 1 -
 libavfilter/vf_idet.c         | 1 -
 libavfilter/vf_yadif.c        | 1 -
 libavutil/internal.h          | 1 -
 libswresample/audioconvert.h  | 1 -
 libswscale/input.c            | 1 -
 libswscale/output.c           | 1 -
 libswscale/swscale_unscaled.c | 1 -
 libswscale/yuv2rgb.c          | 1 -
 13 files changed, 13 deletions(-)

diff --git a/libavcodec/h263dec.c b/libavcodec/h263dec.c
index f05dfbf25e..b4aa109601 100644
--- a/libavcodec/h263dec.c
+++ b/libavcodec/h263dec.c
@@ -27,7 +27,6 @@
 
 #define UNCHECKED_BITSTREAM_READER 1
 
-#include "libavutil/cpu.h"
 #include "libavutil/video_enc_params.h"
 
 #include "avcodec.h"
diff --git a/libavcodec/libxvid.c b/libavcodec/libxvid.c
index e1a1c01f57..7cf9d7661c 100644
--- a/libavcodec/libxvid.c
+++ b/libavcodec/libxvid.c
@@ -30,7 +30,6 @@
 #include <xvid.h>
 
 #include "libavutil/avassert.h"
-#include "libavutil/cpu.h"
 #include "libavutil/file.h"
 #include "libavutil/internal.h"
 #include "libavutil/intreadwrite.h"
diff --git a/libavcodec/x86/vc1dsp_mmx.c b/libavcodec/x86/vc1dsp_mmx.c
index c1c4d76262..b907a92695 100644
--- a/libavcodec/x86/vc1dsp_mmx.c
+++ b/libavcodec/x86/vc1dsp_mmx.c
@@ -25,7 +25,6 @@
  */
 
 #include "libavutil/attributes.h"
-#include "libavutil/cpu.h"
 #include "libavutil/mem.h"
 #include "libavutil/mem_internal.h"
 #include "libavutil/x86/asm.h"
diff --git a/libavfilter/pthread.c b/libavfilter/pthread.c
index 7e37c73ca3..34fc699505 100644
--- a/libavfilter/pthread.c
+++ b/libavfilter/pthread.c
@@ -24,7 +24,6 @@
 #include "config.h"
 
 #include "libavutil/common.h"
-#include "libavutil/cpu.h"
 #include "libavutil/mem.h"
 #include "libavutil/thread.h"
 #include "libavutil/slicethread.h"
diff --git a/libavfilter/vf_gradfun.c b/libavfilter/vf_gradfun.c
index 5284b1d745..af77b13d4d 100644
--- a/libavfilter/vf_gradfun.c
+++ b/libavfilter/vf_gradfun.c
@@ -34,7 +34,6 @@
 
 #include "libavutil/imgutils.h"
 #include "libavutil/common.h"
-#include "libavutil/cpu.h"
 #include "libavutil/mem_internal.h"
 #include "libavutil/opt.h"
 #include "libavutil/pixdesc.h"
diff --git a/libavfilter/vf_idet.c b/libavfilter/vf_idet.c
index eadc24a275..54fc08e915 100644
--- a/libavfilter/vf_idet.c
+++ b/libavfilter/vf_idet.c
@@ -20,7 +20,6 @@
 
 #include <float.h> /* FLT_MAX */
 
-#include "libavutil/cpu.h"
 #include "libavutil/common.h"
 #include "libavutil/opt.h"
 #include "internal.h"
diff --git a/libavfilter/vf_yadif.c b/libavfilter/vf_yadif.c
index b0d9fbaf1f..9cfd2437ac 100644
--- a/libavfilter/vf_yadif.c
+++ b/libavfilter/vf_yadif.c
@@ -20,7 +20,6 @@
  */
 
 #include "libavutil/avassert.h"
-#include "libavutil/cpu.h"
 #include "libavutil/common.h"
 #include "libavutil/pixdesc.h"
 #include "libavutil/imgutils.h"
diff --git a/libavutil/internal.h b/libavutil/internal.h
index 7cd36ff742..a33e8700c3 100644
--- a/libavutil/internal.h
+++ b/libavutil/internal.h
@@ -40,7 +40,6 @@
 #include "config.h"
 #include "attributes.h"
 #include "timer.h"
-#include "cpu.h"
 #include "dict.h"
 #include "macros.h"
 #include "pixfmt.h"
diff --git a/libswresample/audioconvert.h b/libswresample/audioconvert.h
index 1ca30c2a65..bb143a876d 100644
--- a/libswresample/audioconvert.h
+++ b/libswresample/audioconvert.h
@@ -30,7 +30,6 @@
 
 
 #include "swresample_internal.h"
-#include "libavutil/cpu.h"
 
 
 typedef void (conv_func_type)(uint8_t *po, const uint8_t *pi, int is, int os, uint8_t *end);
diff --git a/libswscale/input.c b/libswscale/input.c
index 6850801a44..b65aaf7c06 100644
--- a/libswscale/input.c
+++ b/libswscale/input.c
@@ -25,7 +25,6 @@
 
 #include "libavutil/avutil.h"
 #include "libavutil/bswap.h"
-#include "libavutil/cpu.h"
 #include "libavutil/intreadwrite.h"
 #include "libavutil/mathematics.h"
 #include "libavutil/pixdesc.h"
diff --git a/libswscale/output.c b/libswscale/output.c
index 0a3515f3ca..f1d9a61d53 100644
--- a/libswscale/output.c
+++ b/libswscale/output.c
@@ -27,7 +27,6 @@
 #include "libavutil/avutil.h"
 #include "libavutil/avassert.h"
 #include "libavutil/bswap.h"
-#include "libavutil/cpu.h"
 #include "libavutil/intreadwrite.h"
 #include "libavutil/mathematics.h"
 #include "libavutil/mem_internal.h"
diff --git a/libswscale/swscale_unscaled.c b/libswscale/swscale_unscaled.c
index 1aee3565ab..c83af8bb07 100644
--- a/libswscale/swscale_unscaled.c
+++ b/libswscale/swscale_unscaled.c
@@ -27,7 +27,6 @@
 #include "swscale_internal.h"
 #include "rgb2rgb.h"
 #include "libavutil/intreadwrite.h"
-#include "libavutil/cpu.h"
 #include "libavutil/avutil.h"
 #include "libavutil/mathematics.h"
 #include "libavutil/mem_internal.h"
diff --git a/libswscale/yuv2rgb.c b/libswscale/yuv2rgb.c
index 6a3956e8e2..cac82f4c6f 100644
--- a/libswscale/yuv2rgb.c
+++ b/libswscale/yuv2rgb.c
@@ -27,7 +27,6 @@
 #include <stdlib.h>
 #include <inttypes.h>
 
-#include "libavutil/cpu.h"
 #include "libavutil/bswap.h"
 #include "config.h"
 #include "rgb2rgb.h"



More information about the ffmpeg-cvslog mailing list