[FFmpeg-devel] [PATCH] Replace ASMALIGN() with .p2align

Carl Eugen Hoyos cehoyos
Fri Jun 4 02:10:39 CEST 2010


M?ns Rullg?rd <mans <at> mansr.com> writes:

> I changed the macro to use .p2align.

Thank you.
This fixes "--cc=icc --extra-cflags=-ipo --enable-shared --disable-static" for
icc >=11.1 (earlier versions compile, but the executables are unusable).

"--cc=icc --extra-cflags=-ipo --ar=xiar" does not work currently, because all
xiar version are (imo) completely broken, not allowing identical file-names in a
project (will be fixed by Intel).
A work-around is following (+ svn mv), is it acceptable?

Carl Eugen

Index: libavcodec/x86/Makefile
===================================================================
--- libavcodec/x86/Makefile     (revision 23439)
+++ libavcodec/x86/Makefile     (working copy)
@@ -1,5 +1,5 @@
-OBJS-$(CONFIG_MLP_DECODER)             += x86/mlpdsp.o
-OBJS-$(CONFIG_TRUEHD_DECODER)          += x86/mlpdsp.o
+OBJS-$(CONFIG_MLP_DECODER)             += x86/mlpdsp_x86.o
+OBJS-$(CONFIG_TRUEHD_DECODER)          += x86/mlpdsp_x86.o

 YASM-OBJS-FFT-$(HAVE_AMD3DNOW)         += x86/fft_3dn.o
 YASM-OBJS-FFT-$(HAVE_AMD3DNOWEXT)      += x86/fft_3dn2.o
@@ -26,7 +26,7 @@
 MMX-OBJS-$(HAVE_YASM)                  += x86/dsputil_yasm.o            \
                                           $(YASM-OBJS-yes)

-MMX-OBJS-$(CONFIG_FFT)                 += x86/fft.o
+MMX-OBJS-$(CONFIG_FFT)                 += x86/fft_x86.o

 OBJS-$(HAVE_MMX)                       += x86/cpuid.o                   \
                                           x86/dnxhd_mmx.o               \





More information about the ffmpeg-devel mailing list