avutil/internal: Don't auto-include emms.h

Instead include emms.h wherever it is needed.

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

libavcodec/ac3enc.c

@@ -33,6 +33,7 @@
 #include "libavutil/avstring.h"
 #include "libavutil/channel_layout.h"
 #include "libavutil/crc.h"
+#include "libavutil/emms.h"
 #include "libavutil/internal.h"
 #include "libavutil/mem_internal.h"
 #include "libavutil/opt.h"

libavcodec/avcodec.c

@@ -28,6 +28,7 @@
 #include "libavutil/avstring.h"
 #include "libavutil/bprint.h"
 #include "libavutil/channel_layout.h"
+#include "libavutil/emms.h"
 #include "libavutil/fifo.h"
 #include "libavutil/imgutils.h"
 #include "libavutil/mem.h"

libavcodec/bink.c

@@ -21,6 +21,7 @@
  */
 
 #include "libavutil/attributes.h"
+#include "libavutil/emms.h"
 #include "libavutil/imgutils.h"
 #include "libavutil/internal.h"
 #include "libavutil/mem_internal.h"

libavcodec/cavsdec.c

@@ -26,6 +26,7 @@
  */
 
 #include "libavutil/avassert.h"
+#include "libavutil/emms.h"
 #include "avcodec.h"
 #include "get_bits.h"
 #include "golomb.h"

libavcodec/dca_core.c

@@ -19,6 +19,7 @@
  */
 
 #include "libavutil/channel_layout.h"
+#include "libavutil/emms.h"
 #include "dcaadpcm.h"
 #include "dcadec.h"
 #include "dcadata.h"

libavcodec/decode.c

@@ -32,6 +32,7 @@
 #include "libavutil/bprint.h"
 #include "libavutil/channel_layout.h"
 #include "libavutil/common.h"
+#include "libavutil/emms.h"
 #include "libavutil/fifo.h"
 #include "libavutil/frame.h"
 #include "libavutil/hwcontext.h"

libavcodec/dvdec.c

@@ -36,6 +36,7 @@
  */
 
 #include "libavutil/avassert.h"
+#include "libavutil/emms.h"
 #include "libavutil/internal.h"
 #include "libavutil/mem_internal.h"
 #include "libavutil/thread.h"

libavcodec/dvenc.c

@@ -29,6 +29,7 @@
 #include "config.h"
 
 #include "libavutil/attributes.h"
+#include "libavutil/emms.h"
 #include "libavutil/internal.h"
 #include "libavutil/mem_internal.h"
 #include "libavutil/opt.h"

libavcodec/encode.c

@@ -21,6 +21,7 @@
 #include "libavutil/attributes.h"
 #include "libavutil/avassert.h"
 #include "libavutil/channel_layout.h"
+#include "libavutil/emms.h"
 #include "libavutil/frame.h"
 #include "libavutil/imgutils.h"
 #include "libavutil/internal.h"

libavcodec/faandct.c

@@ -26,6 +26,7 @@
  */
 
 #include "faandct.h"
+#include "libavutil/emms.h"
 #include "libavutil/internal.h"
 #include "libavutil/libm.h"
 

libavcodec/faanidct.c

@@ -20,6 +20,7 @@
  */
 #include "faanidct.h"
 #include "libavutil/common.h"
+#include "libavutil/emms.h"
 
 /* To allow switching to double. */
 typedef float FLOAT;

libavcodec/h264_picture.c

@@ -26,6 +26,7 @@
  */
 
 #include "libavutil/avassert.h"
+#include "libavutil/emms.h"
 #include "error_resilience.h"
 #include "avcodec.h"
 #include "h264dec.h"

libavcodec/h264dec.c

@@ -30,6 +30,7 @@
 #include "config_components.h"
 
 #include "libavutil/avassert.h"
+#include "libavutil/emms.h"
 #include "libavutil/imgutils.h"
 #include "libavutil/opt.h"
 #include "libavutil/thread.h"

libavcodec/huffyuvdec.c

@@ -42,6 +42,7 @@
 #include "huffyuvdsp.h"
 #include "lossless_videodsp.h"
 #include "thread.h"
+#include "libavutil/emms.h"
 #include "libavutil/imgutils.h"
 #include "libavutil/pixdesc.h"
 

libavcodec/huffyuvenc.c

@@ -39,6 +39,7 @@
 #include "huffyuvencdsp.h"
 #include "lossless_videoencdsp.h"
 #include "put_bits.h"
+#include "libavutil/emms.h"
 #include "libavutil/opt.h"
 #include "libavutil/pixdesc.h"
 

libavcodec/mjpegdec.c

@@ -33,6 +33,7 @@
 #include "config_components.h"
 
 #include "libavutil/display.h"
+#include "libavutil/emms.h"
 #include "libavutil/imgutils.h"
 #include "libavutil/avassert.h"
 #include "libavutil/opt.h"

libavcodec/mpeg12dec.c

@@ -31,6 +31,7 @@
 #include <inttypes.h>
 
 #include "libavutil/attributes.h"
+#include "libavutil/emms.h"
 #include "libavutil/imgutils.h"
 #include "libavutil/internal.h"
 #include "libavutil/mem_internal.h"

libavcodec/mpegutils.c

@@ -21,6 +21,7 @@
 #include <stdint.h>
 
 #include "libavutil/common.h"
+#include "libavutil/emms.h"
 #include "libavutil/frame.h"
 #include "libavutil/pixdesc.h"
 #include "libavutil/motion_vector.h"

libavcodec/mpegvideo_dec.c

@@ -25,6 +25,7 @@
 #include "config_components.h"
 
 #include "libavutil/avassert.h"
+#include "libavutil/emms.h"
 #include "libavutil/imgutils.h"
 #include "libavutil/internal.h"
 #include "libavutil/video_enc_params.h"

libavcodec/mpegvideo_enc.c

@@ -35,6 +35,7 @@
 
 #include <stdint.h>
 
+#include "libavutil/emms.h"
 #include "libavutil/internal.h"
 #include "libavutil/intmath.h"
 #include "libavutil/mathematics.h"

libavcodec/ratecontrol.c

@@ -26,6 +26,7 @@
  */
 
 #include "libavutil/attributes.h"
+#include "libavutil/emms.h"
 #include "libavutil/internal.h"
 
 #include "avcodec.h"

libavcodec/sbcenc.c

@@ -31,6 +31,7 @@
  */
 
 #include "libavutil/channel_layout.h"
+#include "libavutil/emms.h"
 #include "libavutil/opt.h"
 #include "avcodec.h"
 #include "codec_internal.h"

libavcodec/snowdec.c

@@ -18,6 +18,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include "libavutil/emms.h"
 #include "libavutil/intmath.h"
 #include "libavutil/log.h"
 #include "libavutil/opt.h"

libavcodec/snowenc.c

@@ -18,6 +18,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include "libavutil/emms.h"
 #include "libavutil/intmath.h"
 #include "libavutil/libm.h"
 #include "libavutil/log.h"

libavcodec/svq1enc.c

@@ -26,6 +26,7 @@
  *   http://www.pcisys.net/~melanson/codecs/
  */
 
+#include "libavutil/emms.h"
 #include "avcodec.h"
 #include "codec_internal.h"
 #include "encode.h"

libavcodec/tests/dct.c

@@ -37,6 +37,7 @@
 
 #include "libavutil/cpu.h"
 #include "libavutil/common.h"
+#include "libavutil/emms.h"
 #include "libavutil/internal.h"
 #include "libavutil/lfg.h"
 #include "libavutil/mem_internal.h"

libavcodec/tests/motion.c

@@ -30,6 +30,7 @@
 #include "config.h"
 #include "libavcodec/me_cmp.h"
 #include "libavutil/cpu.h"
+#include "libavutil/emms.h"
 #include "libavutil/internal.h"
 #include "libavutil/lfg.h"
 #include "libavutil/mem.h"

libavcodec/vp3.c

@@ -35,6 +35,7 @@
 #include <stddef.h>
 #include <string.h>
 
+#include "libavutil/emms.h"
 #include "libavutil/imgutils.h"
 #include "libavutil/mem_internal.h"
 

libavfilter/vf_deshake.c

@@ -53,6 +53,7 @@
 #include "internal.h"
 #include "video.h"
 #include "libavutil/common.h"
+#include "libavutil/emms.h"
 #include "libavutil/file_open.h"
 #include "libavutil/mem.h"
 #include "libavutil/opt.h"

libavfilter/vf_fspp.c

@@ -35,6 +35,7 @@
  * project, and ported by Arwa Arif for FFmpeg.
  */
 
+#include "libavutil/emms.h"
 #include "libavutil/imgutils.h"
 #include "libavutil/mem_internal.h"
 #include "libavutil/opt.h"

libavfilter/vf_gradfun.c

@@ -32,6 +32,7 @@
  * Dither it back to 8bit.
  */
 
+#include "libavutil/emms.h"
 #include "libavutil/imgutils.h"
 #include "libavutil/common.h"
 #include "libavutil/mem_internal.h"

libavfilter/vf_hqdn3d.c

@@ -31,6 +31,7 @@
 #include "config.h"
 #include "libavutil/attributes.h"
 #include "libavutil/common.h"
+#include "libavutil/emms.h"
 #include "libavutil/pixdesc.h"
 #include "libavutil/intreadwrite.h"
 #include "libavutil/opt.h"

libavfilter/vf_mpdecimate.c

@@ -24,6 +24,7 @@
  * Rich Felker.
  */
 
+#include "libavutil/emms.h"
 #include "libavutil/opt.h"
 #include "libavutil/pixdesc.h"
 #include "libavutil/pixelutils.h"

libavfilter/vf_noise.c

@@ -24,6 +24,7 @@
  * noise generator
  */
 
+#include "libavutil/emms.h"
 #include "libavutil/opt.h"
 #include "libavutil/imgutils.h"
 #include "libavutil/lfg.h"

libavfilter/vf_pp7.c

@@ -27,6 +27,7 @@
  * project, and ported by Arwa Arif for FFmpeg.
  */
 
+#include "libavutil/emms.h"
 #include "libavutil/imgutils.h"
 #include "libavutil/mem_internal.h"
 #include "libavutil/opt.h"

libavfilter/vf_pullup.c

@@ -19,6 +19,7 @@
  */
 
 #include "libavutil/avassert.h"
+#include "libavutil/emms.h"
 #include "libavutil/imgutils.h"
 #include "libavutil/opt.h"
 #include "libavutil/pixdesc.h"

libavfilter/vf_spp.c

@@ -31,6 +31,7 @@
  * ported by Clément Bœsch for FFmpeg.
  */
 
+#include "libavutil/emms.h"
 #include "libavutil/imgutils.h"
 #include "libavutil/mem_internal.h"
 #include "libavutil/opt.h"

libavutil/emms.h

@@ -16,12 +16,14 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef AVUTIL_X86_EMMS_H
+#ifndef AVUTIL_EMMS_H
-#define AVUTIL_X86_EMMS_H
+#define AVUTIL_EMMS_H
 
 #include "config.h"
 #include "libavutil/attributes.h"
 
+#if ARCH_X86
+
 void avpriv_emms_asm(void);
 
 #if HAVE_MMX_INLINE
@@ -55,4 +57,10 @@ static av_always_inline void emms_c(void)
 #   define emms_c avpriv_emms_asm
 #endif /* HAVE_MMX_INLINE */
 
-#endif /* AVUTIL_X86_EMMS_H */
+#endif /* ARCH_X86 */
+
+#ifndef emms_c
+#   define emms_c() do {} while(0)
+#endif
+
+#endif /* AVUTIL_EMMS_H */

libavutil/internal.h

@@ -43,14 +43,6 @@
 #include "macros.h"
 #include "pixfmt.h"
 
-#if ARCH_X86
-#   include "x86/emms.h"
-#endif
-
-#ifndef emms_c
-#   define emms_c() do {} while(0)
-#endif
-
 #ifndef attribute_align_arg
 #if ARCH_X86_32 && AV_GCC_VERSION_AT_LEAST(4,2)
 #    define attribute_align_arg __attribute__((force_align_arg_pointer))

libswscale/swscale.c

@@ -26,6 +26,7 @@
 #include "libavutil/bswap.h"
 #include "libavutil/common.h"
 #include "libavutil/cpu.h"
+#include "libavutil/emms.h"
 #include "libavutil/intreadwrite.h"
 #include "libavutil/mem_internal.h"
 #include "libavutil/pixdesc.h"

libswscale/utils.c

@@ -40,6 +40,7 @@
 #include "libavutil/attributes.h"
 #include "libavutil/avassert.h"
 #include "libavutil/cpu.h"
+#include "libavutil/emms.h"
 #include "libavutil/imgutils.h"
 #include "libavutil/intreadwrite.h"
 #include "libavutil/libm.h"

tests/checkasm/checkasm.h

@@ -37,6 +37,7 @@
 
 #include "libavutil/avstring.h"
 #include "libavutil/cpu.h"
+#include "libavutil/emms.h"
 #include "libavutil/internal.h"
 #include "libavutil/lfg.h"
 #include "libavutil/timer.h"

tests/checkasm/vp9dsp.c

@@ -24,6 +24,7 @@
 #include "libavcodec/vp9data.h"
 #include "libavcodec/vp9.h"
 #include "libavutil/common.h"
+#include "libavutil/emms.h"
 #include "libavutil/internal.h"
 #include "libavutil/intreadwrite.h"
 #include "libavutil/mathematics.h"