summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/libffmpeg/libavcodec/i386/Makefile.am6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/libffmpeg/libavcodec/i386/Makefile.am b/src/libffmpeg/libavcodec/i386/Makefile.am
index 41f614db7..49df37f80 100644
--- a/src/libffmpeg/libavcodec/i386/Makefile.am
+++ b/src/libffmpeg/libavcodec/i386/Makefile.am
@@ -5,7 +5,10 @@ include $(top_srcdir)/misc/Makefile.common
AM_CFLAGS = $(LIBFFMPEG_CFLAGS) -I$(top_srcdir)/src/libffmpeg/libavutil -fomit-frame-pointer
# CFLAGS is here to filter out -funroll-loops because it causes bad
# behavior of libavcodec
-CFLAGS = `echo @CFLAGS@ | sed -e 's/-funroll-loops//g'`
+CFLAGS := `echo @CFLAGS@ | sed -e 's/-funroll-loops//g'`
+
+# Avoid "can't find register" failures with -O1 and higher
+dsputil_mmx.o dsputil_mmx.lo: CFLAGS=`echo @CFLAGS@ | sed -e 's/-funroll-loops//g; s/-O[0-9]/-Os/g'`
ASFLAGS =
@@ -37,7 +40,6 @@ if HAVE_FFMMX
mmx_modules = $(libavcodec_mmx_src)
endif
-
libavcodec_mmx_la_SOURCES = $(mmx_modules) $(libavcodec_mmx_dummy)
noinst_HEADERS = dsputil_mmx_avg.h dsputil_mmx_rnd.h mmx.h