Diego Biurrun <di...@biurrun.de> writes: > --- > libavutil/x86/cpu.c | 34 +++++++++++++++++++++++----------- > 1 files changed, 23 insertions(+), 11 deletions(-) > > diff --git a/libavutil/x86/cpu.c b/libavutil/x86/cpu.c > index 9cf68e4..bf1ed0b 100644 > --- a/libavutil/x86/cpu.c > +++ b/libavutil/x86/cpu.c > @@ -86,16 +86,16 @@ > > #endif /* HAVE_INLINE_ASM */ > > -/* Function to test if multimedia instructions are supported... */ > -int ff_get_cpu_flags_x86(void) > -{ > - int rval = 0; > - int eax, ebx, ecx, edx; > - int max_std_level, max_ext_level, std_caps = 0, ext_caps = 0; > - int family = 0, model = 0; > - union { int i[3]; char c[12]; } vendor; > +#if ARCH_X86_64 > + > +#define have_cpuid 1
have_cpuid() The patch as is will not compile. > +#elif HAVE_INLINE_ASM || HAVE_RWEFLAGS > > -#if ARCH_X86_32 > +#define have_cpuid cpuid_test > + > +static int cpuid_test(void) Unnecessary indirection. -- Måns Rullgård m...@mansr.com _______________________________________________ libav-devel mailing list libav-devel@libav.org https://lists.libav.org/mailman/listinfo/libav-devel