diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2007-04-11 16:57:40 +0100 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2007-04-11 16:57:40 +0100 |
| commit | 926542d8abcb138208a175ca09ef12e6a9f468f4 (patch) | |
| tree | fb67293754956116e369b97725d8dcb8aa2347d6 /src/libffmpeg | |
| parent | 33b45cfbe39f1bc84479f2a5ede235e5659162e9 (diff) | |
| parent | 104d3fdf2af507145f7a936d5b2208c9a678638c (diff) | |
| download | xine-lib-926542d8abcb138208a175ca09ef12e6a9f468f4.tar.gz xine-lib-926542d8abcb138208a175ca09ef12e6a9f468f4.tar.bz2 | |
Merge from -build-fixes branch.
Diffstat (limited to 'src/libffmpeg')
| -rw-r--r-- | src/libffmpeg/libavcodec/i386/Makefile.am | 3 | ||||
| -rw-r--r-- | src/libffmpeg/libavcodec/libpostproc/Makefile.am | 4 |
2 files changed, 7 insertions, 0 deletions
diff --git a/src/libffmpeg/libavcodec/i386/Makefile.am b/src/libffmpeg/libavcodec/i386/Makefile.am index e3285d9cd..b9d33c3a7 100644 --- a/src/libffmpeg/libavcodec/i386/Makefile.am +++ b/src/libffmpeg/libavcodec/i386/Makefile.am @@ -14,6 +14,9 @@ dsputil_mmx.o dsputil_mmx.lo: CFLAGS=$(shell echo @CFLAGS@ | sed -e 's/-funroll- # Avoid errors on (at least) amd64 with -O0 fdct_mmx.o fdct_mmx.lo: CFLAGS=`echo @CFLAGS@ | sed -e 's/^/-Os /; s/-O0\?\s/-Os /g'` +# Avoid errors with -O0 +mpegvideo_mmx.o mpegvideo_mmx.lo: CFLAGS=`echo @CFLAGS@ | sed -e 's/-O0\?\s/-Os /g'` + ASFLAGS = noinst_LTLIBRARIES = libavcodec_mmx.la diff --git a/src/libffmpeg/libavcodec/libpostproc/Makefile.am b/src/libffmpeg/libavcodec/libpostproc/Makefile.am index af1976b48..66bd17e53 100644 --- a/src/libffmpeg/libavcodec/libpostproc/Makefile.am +++ b/src/libffmpeg/libavcodec/libpostproc/Makefile.am @@ -4,6 +4,10 @@ include $(top_srcdir)/misc/Makefile.common # work, but at least it compiles. AM_CFLAGS = -fomit-frame-pointer -fno-strict-aliasing AM_CPPFLAGS = $(LIBFFMPEG_CPPFLAGS) -I$(top_srcdir)/src/libffmpeg/libavcodec + +# Avoid errors with -O0 +postprocess.o postprocess.lo: CFLAGS=`echo @CFLAGS@ | sed -e 's/-O0\?\s/-Os /g'` + ASFLAGS = noinst_LTLIBRARIES = libpostprocess.la |