r810 borked hpel_filter_sse2 on unaligned buffers

[x264] / Makefile

diff --git a/Makefile b/Makefile
index 3f3a16ba7bc950ffa8d7f3479d63399843acd9c0..81c05052176c7a3974d5dbd46effb82f200c99b6 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -21,7 +21,7 @@ endif
 
 # MMX/SSE optims
 ifneq ($(AS),)
-X86SRC0 = dct-a.asm deblock-a.asm mc-a.asm mc-a2.asm \
+X86SRC0 = cabac-a.asm dct-a.asm deblock-a.asm mc-a.asm mc-a2.asm \
           pixel-a.asm predict-a.asm quant-a.asm sad-a.asm \
           cpu-32.asm dct-32.asm
 X86SRC = $(X86SRC0:%=common/x86/%)
@@ -32,6 +32,7 @@ ASMSRC  = $(X86SRC) common/x86/pixel-32.asm
 OBJASM  = $(ASMSRC:%.asm=%.o)
 ASFLAGS += -Icommon/x86/
 $(OBJASM): common/x86/x86inc.asm common/x86/x86inc-32.asm
+checkasm: tools/checkasm-32.o
 endif
 
 ifeq ($(ARCH),X86_64)
@@ -75,7 +76,7 @@ libx264.a: .depend $(OBJS) $(OBJASM)
        ranlib libx264.a
 
 $(SONAME): .depend $(OBJS) $(OBJASM)
-       $(CC) -shared -o $@ $(OBJS) $(OBJASM) -Wl,-soname,$(SONAME) $(LDFLAGS)
+       $(CC) -shared -o $@ $(OBJS) $(OBJASM) $(SOFLAGS) $(LDFLAGS)
 
 x264$(EXE): $(OBJCLI) libx264.a 
        $(CC) -o $@ $+ $(LDFLAGS)
@@ -110,7 +111,10 @@ OPT0 = --crf 30 -b1 -m1 -r1 --me dia --no-cabac --pre-scenecut --direct temporal
 OPT1 = --crf 16 -b2 -m3 -r3 --me hex -8 --direct spatial --no-dct-decimate
 OPT2 = --crf 26 -b2 -m5 -r2 --me hex -8 -w --cqm jvt --nr 100
 OPT3 = --crf 18 -b3 -m7 -r5 --me umh -8 -t1 -A all --mixed-refs --b-rdo -w --b-pyramid --direct auto --bime --no-fast-pskip
-OPT4 = --crf 22 -b3 -m6 -r3 --me esa -8 -t2 -A all --mixed-refs --b-rdo --bime
+OPT4 = --crf 22 -b3 -m6 -r4 --me esa -8 -t2 -A all --mixed-refs --b-rdo --bime
+OPT5 = --frames 50 --crf 24 -b3 -m7 -r3 --me tesa -8 -t1 --mixed-refs --b-rdo --bime
+OPT6 = --frames 50 -q0 -m6 -r2 --me hex -Aall
+OPT7 = --frames 50 -q0 -m2 -r1 --me hex --no-cabac
 
 ifeq (,$(VIDS))
 fprofiled:
@@ -123,7 +127,7 @@ fprofiled:
        mv config.mak config.mak2
        sed -e 's/CFLAGS.*/& -fprofile-generate/; s/LDFLAGS.*/& -fprofile-generate/' config.mak2 > config.mak
        $(MAKE) x264$(EXE)
-       $(foreach V, $(VIDS), $(foreach I, 0 1 2 3 4, ./x264$(EXE) $(OPT$I) $(V) --progress -o $(DEVNULL) ;))
+       $(foreach V, $(VIDS), $(foreach I, 0 1 2 3 4 5 6 7, ./x264$(EXE) $(OPT$I) $(V) --progress -o $(DEVNULL) ;))
        rm -f $(SRC2:%.c=%.o)
        sed -e 's/CFLAGS.*/& -fprofile-use/; s/LDFLAGS.*/& -fprofile-use/' config.mak2 > config.mak
        $(MAKE)
@@ -144,16 +148,21 @@ distclean: clean
        rm -rf test/
        $(MAKE) -C gtk distclean
 
-install: x264 $(SONAME)
+install: x264$(EXE) $(SONAME)
        install -d $(DESTDIR)$(bindir) $(DESTDIR)$(includedir)
        install -d $(DESTDIR)$(libdir) $(DESTDIR)$(libdir)/pkgconfig
        install -m 644 x264.h $(DESTDIR)$(includedir)
        install -m 644 libx264.a $(DESTDIR)$(libdir)
        install -m 644 x264.pc $(DESTDIR)$(libdir)/pkgconfig
-       install x264 $(DESTDIR)$(bindir)
+       install x264$(EXE) $(DESTDIR)$(bindir)
        ranlib $(DESTDIR)$(libdir)/libx264.a
+ifeq ($(SYS),MINGW)
+       $(if $(SONAME), install -m 755 $(SONAME) $(DESTDIR)$(bindir))
+else
        $(if $(SONAME), ln -sf $(SONAME) $(DESTDIR)$(libdir)/libx264.so)
        $(if $(SONAME), install -m 755 $(SONAME) $(DESTDIR)$(libdir))
+endif
+       $(if $(IMPLIBNAME), install -m 644 $(IMPLIBNAME) $(DESTDIR)$(libdir))
 
 install-gtk: libx264gtk.a
        $(MAKE) -C gtk install