highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avutil/x86/emms: Don't unnecessarily include lavu/cpu.h

Browse Source 
Only include it if it is needed, namely if __MMX__ is undefined.

X86 is currently the only arch where lavu/cpu.h is basically
automatically included (for internal development): #if ARCH_X86
is true, lavu/internal.h (which is basically included everywhere)
includes lavu/x86/emms.h which can mask missing inclusions
of lavu/cpu.h if the developer works on x86/x64. This has happened
in 8e825ec3ab09d877f12dcf05d76902a8bb9c8b11 and also earlier
(see 6d2365882f281f9452b31b91edb2e6a2d4f5ff08).
By including said header only if necessary ordinary developer machines
will behave like non-x86 arches, so that missing inclusions of cpu.h
won't go unnoticed any more.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt 2021-07-30 16:41:30 +02:00
parent b8e58f0858
commit 6c694074e1
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavutil/x86/emms.h
View File

@ -21,11 +21,14 @@
#include "config.h"
#include "libavutil/attributes.h"
#include "libavutil/cpu.h"
void avpriv_emms_asm(void);
#if HAVE_MMX_INLINE
#ifndef __MMX__
#include "libavutil/cpu.h"
#endif
# define emms_c emms_c
/**
* Empty mmx state.