Disable weightp offset=-1 dupes with high bit depth

[x264] / Makefile

diff --git a/Makefile b/Makefile
index 24cf324d0abf90a7edba4e65ee6a8caeb8474e68..ebf1f621325915fa4d439f714655754b31969eff 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -7,38 +7,47 @@ all: default
 SRCS = common/mc.c common/predict.c common/pixel.c common/macroblock.c \
        common/frame.c common/dct.c common/cpu.c common/cabac.c \
        common/common.c common/mdate.c common/rectangle.c \
-       common/set.c common/quant.c common/vlc.c \
+       common/set.c common/quant.c common/deblock.c common/vlc.c \
+       common/mvpred.c common/bitstream.c \
        encoder/analyse.c encoder/me.c encoder/ratecontrol.c \
        encoder/set.c encoder/macroblock.c encoder/cabac.c \
        encoder/cavlc.c encoder/encoder.c encoder/lookahead.c
 
-SRCCLI = x264.c input/timecode.c \
-         input/yuv.c input/y4m.c output/raw.c \
-         output/matroska.c output/matroska_ebml.c \
-         output/flv.c output/flv_bytestream.c
+SRCCLI = x264.c input/input.c input/timecode.c input/raw.c input/y4m.c \
+         output/raw.c output/matroska.c output/matroska_ebml.c \
+         output/flv.c output/flv_bytestream.c filters/filters.c \
+         filters/video/video.c filters/video/source.c filters/video/internal.c \
+         filters/video/resize.c filters/video/cache.c filters/video/fix_vfr_pts.c \
+         filters/video/select_every.c filters/video/crop.c filters/video/depth.c
 
 SRCSO =
 
 CONFIG := $(shell cat config.h)
 
-# Optional muxer module sources
-ifneq ($(findstring AVS_INPUT, $(CONFIG)),)
+# GPL-only files
+ifeq ($(GPL),yes)
+SRCCLI +=
+endif
+
+# Optional module sources
+ifneq ($(findstring HAVE_AVS, $(CONFIG)),)
 SRCCLI += input/avs.c
 endif
 
 ifneq ($(findstring HAVE_PTHREAD, $(CONFIG)),)
 SRCCLI += input/thread.c
+SRCS   += common/threadpool.c
 endif
 
-ifneq ($(findstring LAVF_INPUT, $(CONFIG)),)
+ifneq ($(findstring HAVE_LAVF, $(CONFIG)),)
 SRCCLI += input/lavf.c
 endif
 
-ifneq ($(findstring FFMS_INPUT, $(CONFIG)),)
+ifneq ($(findstring HAVE_FFMS, $(CONFIG)),)
 SRCCLI += input/ffms.c
 endif
 
-ifneq ($(findstring MP4_OUTPUT, $(CONFIG)),)
+ifneq ($(findstring HAVE_GPAC, $(CONFIG)),)
 SRCCLI += output/mp4.c
 endif
 
@@ -49,9 +58,9 @@ endif
 
 # MMX/SSE optims
 ifneq ($(AS),)
-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-a.asm dct-32.asm
+X86SRC0 = const-a.asm 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-a.asm dct-32.asm bitstream-a.asm
 X86SRC = $(X86SRC0:%=common/x86/%)
 
 ifeq ($(ARCH),X86)
@@ -101,7 +110,7 @@ OBJASM  = $(ASMSRC:%.asm=%.o)
 endif
 
 ifneq ($(HAVE_GETOPT_LONG),1)
-SRCS += extras/getopt.c
+SRCCLI += extras/getopt.c
 endif
 
 ifneq ($(SONAME),)
@@ -127,7 +136,7 @@ $(SONAME): .depend $(OBJS) $(OBJASM) $(OBJSO)
        $(CC) -shared -o $@ $(OBJS) $(OBJASM) $(OBJSO) $(SOFLAGS) $(LDFLAGS)
 
 x264$(EXE): $(OBJCLI) libx264.a
-       $(CC) -o $@ $+ $(LDFLAGS) $(LDFLAGSCLI)
+       $(CC) -o $@ $+ $(LDFLAGSCLI) $(LDFLAGS)
 
 checkasm: tools/checkasm.o libx264.a
        $(CC) -o $@ $+ $(LDFLAGS)
@@ -193,8 +202,10 @@ distclean: clean
        rm -rf test/
 
 install: x264$(EXE) $(SONAME)
-       install -d $(DESTDIR)$(bindir) $(DESTDIR)$(includedir)
-       install -d $(DESTDIR)$(libdir) $(DESTDIR)$(libdir)/pkgconfig
+       install -d $(DESTDIR)$(bindir)
+       install -d $(DESTDIR)$(includedir)
+       install -d $(DESTDIR)$(libdir)
+       install -d $(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
@@ -203,7 +214,7 @@ install: x264$(EXE) $(SONAME)
 ifeq ($(SYS),MINGW)
        $(if $(SONAME), install -m 755 $(SONAME) $(DESTDIR)$(bindir))
 else
-       $(if $(SONAME), ln -sf $(SONAME) $(DESTDIR)$(libdir)/libx264.$(SOSUFFIX))
+       $(if $(SONAME), ln -f -s $(SONAME) $(DESTDIR)$(libdir)/libx264.$(SOSUFFIX))
        $(if $(SONAME), install -m 755 $(SONAME) $(DESTDIR)$(libdir))
 endif
        $(if $(IMPLIBNAME), install -m 644 $(IMPLIBNAME) $(DESTDIR)$(libdir))
@@ -217,20 +228,3 @@ etags: TAGS
 
 TAGS:
        etags $(SRCS)
-
-dox:
-       doxygen Doxyfile
-
-ifeq (,$(VIDS))
-test:
-       @echo 'usage: make test VIDS="infile1 infile2 ..."'
-       @echo 'where infiles are anything that x264 understands,'
-       @echo 'i.e. YUV with resolution in the filename, y4m, or avisynth.'
-else
-test:
-       perl tools/regression-test.pl --version=head,current --options='$(OPT0)' --options='$(OPT1)' --options='$(OPT2)' $(VIDS:%=--input=%)
-endif
-
-testclean:
-       rm -f test/*.log test/*.264
-       $(foreach DIR, $(wildcard test/x264-r*/), cd $(DIR) ; make clean ; cd ../.. ;)