@@ -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"
@@ -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"
@@ -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"
@@ -26,6 +26,7 @@
*/
#include "libavutil/avassert.h"
+#include "libavutil/emms.h"
#include "avcodec.h"
#include "get_bits.h"
#include "golomb.h"
@@ -19,6 +19,7 @@
*/
#include "libavutil/channel_layout.h"
+#include "libavutil/emms.h"
#include "dcaadpcm.h"
#include "dcadec.h"
#include "dcadata.h"
@@ -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"
@@ -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"
@@ -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"
@@ -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"
@@ -26,6 +26,7 @@
*/
#include "faandct.h"
+#include "libavutil/emms.h"
#include "libavutil/internal.h"
#include "libavutil/libm.h"
@@ -20,6 +20,7 @@
*/
#include "faanidct.h"
#include "libavutil/common.h"
+#include "libavutil/emms.h"
/* To allow switching to double. */
typedef float FLOAT;
@@ -26,6 +26,7 @@
*/
#include "libavutil/avassert.h"
+#include "libavutil/emms.h"
#include "error_resilience.h"
#include "avcodec.h"
#include "h264dec.h"
@@ -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"
@@ -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"
@@ -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"
@@ -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"
@@ -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"
@@ -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"
@@ -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"
@@ -35,6 +35,7 @@
#include <stdint.h>
+#include "libavutil/emms.h"
#include "libavutil/internal.h"
#include "libavutil/intmath.h"
#include "libavutil/mathematics.h"
@@ -26,6 +26,7 @@
*/
#include "libavutil/attributes.h"
+#include "libavutil/emms.h"
#include "libavutil/internal.h"
#include "avcodec.h"
@@ -31,6 +31,7 @@
*/
#include "libavutil/channel_layout.h"
+#include "libavutil/emms.h"
#include "libavutil/opt.h"
#include "avcodec.h"
#include "codec_internal.h"
@@ -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"
@@ -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"
@@ -26,6 +26,7 @@
* http://www.pcisys.net/~melanson/codecs/
*/
+#include "libavutil/emms.h"
#include "avcodec.h"
#include "codec_internal.h"
#include "encode.h"
@@ -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"
@@ -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"
@@ -35,6 +35,7 @@
#include <stddef.h>
#include <string.h>
+#include "libavutil/emms.h"
#include "libavutil/imgutils.h"
#include "libavutil/mem_internal.h"
@@ -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"
@@ -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"
@@ -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"
@@ -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"
@@ -24,6 +24,7 @@
* Rich Felker.
*/
+#include "libavutil/emms.h"
#include "libavutil/opt.h"
#include "libavutil/pixdesc.h"
#include "libavutil/pixelutils.h"
@@ -24,6 +24,7 @@
* noise generator
*/
+#include "libavutil/emms.h"
#include "libavutil/opt.h"
#include "libavutil/imgutils.h"
#include "libavutil/lfg.h"
@@ -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"
@@ -19,6 +19,7 @@
*/
#include "libavutil/avassert.h"
+#include "libavutil/emms.h"
#include "libavutil/imgutils.h"
#include "libavutil/opt.h"
#include "libavutil/pixdesc.h"
@@ -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"
similarity index 91%
rename from libavutil/x86/emms.h
rename to libavutil/emms.h
@@ -16,12 +16,14 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef AVUTIL_X86_EMMS_H
-#define AVUTIL_X86_EMMS_H
+#ifndef AVUTIL_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 */
@@ -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))
@@ -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"
@@ -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"
@@ -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"
@@ -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"
Instead include emms.h wherever it is needed. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> --- libavcodec/ac3enc.c | 1 + libavcodec/avcodec.c | 1 + libavcodec/bink.c | 1 + libavcodec/cavsdec.c | 1 + libavcodec/dca_core.c | 1 + libavcodec/decode.c | 1 + libavcodec/dvdec.c | 1 + libavcodec/dvenc.c | 1 + libavcodec/encode.c | 1 + libavcodec/faandct.c | 1 + libavcodec/faanidct.c | 1 + libavcodec/h264_picture.c | 1 + libavcodec/h264dec.c | 1 + libavcodec/huffyuvdec.c | 1 + libavcodec/huffyuvenc.c | 1 + libavcodec/mjpegdec.c | 1 + libavcodec/mpeg12dec.c | 1 + libavcodec/mpegutils.c | 1 + libavcodec/mpegvideo_dec.c | 1 + libavcodec/mpegvideo_enc.c | 1 + libavcodec/ratecontrol.c | 1 + libavcodec/sbcenc.c | 1 + libavcodec/snowdec.c | 1 + libavcodec/snowenc.c | 1 + libavcodec/svq1enc.c | 1 + libavcodec/tests/dct.c | 1 + libavcodec/tests/motion.c | 1 + libavcodec/vp3.c | 1 + libavfilter/vf_deshake.c | 1 + libavfilter/vf_fspp.c | 1 + libavfilter/vf_gradfun.c | 1 + libavfilter/vf_hqdn3d.c | 1 + libavfilter/vf_mpdecimate.c | 1 + libavfilter/vf_noise.c | 1 + libavfilter/vf_pp7.c | 1 + libavfilter/vf_pullup.c | 1 + libavfilter/vf_spp.c | 1 + libavutil/{x86 => }/emms.h | 14 +++++++++++--- libavutil/internal.h | 8 -------- libswscale/swscale.c | 1 + libswscale/utils.c | 1 + tests/checkasm/checkasm.h | 1 + tests/checkasm/vp9dsp.c | 1 + 43 files changed, 52 insertions(+), 11 deletions(-) rename libavutil/{x86 => }/emms.h (91%)