Quoting Henrik Gramner (2015-08-01 17:27:38) > --- > libavutil/x86/x86inc.asm | 10 +++++----- > 1 file changed, 5 insertions(+), 5 deletions(-) > > diff --git a/libavutil/x86/x86inc.asm b/libavutil/x86/x86inc.asm > index d70a5f9..0e2f447 100644 > --- a/libavutil/x86/x86inc.asm > +++ b/libavutil/x86/x86inc.asm > @@ -1,7 +1,7 @@ > > ;***************************************************************************** > ;* x86inc.asm: x264asm abstraction layer > > ;***************************************************************************** > -;* Copyright (C) 2005-2013 x264 project > +;* Copyright (C) 2005-2015 x264 project > ;* > ;* Authors: Loren Merritt <[email protected]> > ;* Anton Mitrofanov <[email protected]> > @@ -740,7 +740,7 @@ BRANCH_INSTR jz, je, jnz, jne, jl, jle, jnl, jnle, jg, > jge, jng, jnge, ja, jae, > > ; This is needed for ELF, otherwise the GNU linker assumes the stack is > executable by default. > %if FORMAT_ELF > -[section .note.GNU-stack noalloc noexec nowrite progbits] > + [SECTION .note.GNU-stack noalloc noexec nowrite progbits] > %endif > > ; cpuflags > @@ -759,8 +759,8 @@ BRANCH_INSTR jz, je, jnz, jne, jl, jle, jnl, jnle, jg, > jge, jng, jnge, ja, jae, > %assign cpuflags_avx (1<<11)| cpuflags_sse42 > %assign cpuflags_xop (1<<12)| cpuflags_avx > %assign cpuflags_fma4 (1<<13)| cpuflags_avx > -%assign cpuflags_avx2 (1<<14)| cpuflags_avx > -%assign cpuflags_fma3 (1<<15)| cpuflags_avx > +%assign cpuflags_fma3 (1<<14)| cpuflags_avx > +%assign cpuflags_avx2 (1<<15)| cpuflags_fma3 > > %assign cpuflags_cache32 (1<<16) > %assign cpuflags_cache64 (1<<17) > @@ -809,7 +809,7 @@ BRANCH_INSTR jz, je, jnz, jne, jl, jle, jnl, jnle, jg, > jge, jng, jnge, ja, jae, > %endif > %endif > > - %if cpuflag(sse2) > + %if ARCH_X86_64 || cpuflag(sse2) > %ifdef __NASM_VER__ > ALIGNMODE k8 > %else > -- > 1.8.3.2
The last hunk does not apply cleanly without 7/8. Could you please rebase it? -- Anton Khirnov _______________________________________________ libav-devel mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-devel
