diff options
| author | John Koleszar <jkoleszar@google.com> | 2011-03-03 08:59:34 -0500 |
|---|---|---|
| committer | John Koleszar <jkoleszar@google.com> | 2011-03-03 08:59:34 -0500 |
| commit | ca29f6a7c47471621da52e96cb2d5c5acb81b41b (patch) | |
| tree | 57b2392bc6fcb2f7b49f90cb05043da8edcbf6e2 /vp8/vp8cx.mk | |
| parent | 738a79191725f5af4a08451312f5a48fb386bc4b (diff) | |
| parent | 6f5189c044cf52171822f6df1ad6ae4a3bcaf2c4 (diff) | |
| download | libvpx-ca29f6a7c47471621da52e96cb2d5c5acb81b41b.tar libvpx-ca29f6a7c47471621da52e96cb2d5c5acb81b41b.tar.gz libvpx-ca29f6a7c47471621da52e96cb2d5c5acb81b41b.tar.bz2 libvpx-ca29f6a7c47471621da52e96cb2d5c5acb81b41b.zip | |
Merge remote branch 'internal/upstream' into HEAD
Conflicts:
vp8/vp8_cx_iface.c
Change-Id: Iecfd4532ab1c722d10ecce8a5ec473e96093cf3b
Diffstat (limited to 'vp8/vp8cx.mk')
| -rw-r--r-- | vp8/vp8cx.mk | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/vp8/vp8cx.mk b/vp8/vp8cx.mk index a84188f0c..ed2feddae 100644 --- a/vp8/vp8cx.mk +++ b/vp8/vp8cx.mk @@ -85,6 +85,7 @@ VP8_CX_SRCS-yes += encoder/temporal_filter.h ifeq ($(CONFIG_REALTIME_ONLY),yes) VP8_CX_SRCS_REMOVE-yes += encoder/firstpass.c +VP8_CX_SRCS_REMOVE-yes += encoder/temporal_filter.c endif VP8_CX_SRCS-$(ARCH_X86)$(ARCH_X86_64) += encoder/x86/encodemb_x86.h @@ -114,4 +115,9 @@ VP8_CX_SRCS-$(HAVE_SSE4_1) += encoder/x86/sad_sse4.asm VP8_CX_SRCS-$(ARCH_X86)$(ARCH_X86_64) += encoder/x86/quantize_mmx.asm VP8_CX_SRCS-$(ARCH_X86)$(ARCH_X86_64) += encoder/x86/encodeopt.asm +ifeq ($(CONFIG_REALTIME_ONLY),yes) +VP8_CX_SRCS_REMOVE-$(HAVE_SSE2) += encoder/x86/temporal_filter_apply_sse2.asm +endif + + VP8_CX_SRCS-yes := $(filter-out $(VP8_CX_SRCS_REMOVE-yes),$(VP8_CX_SRCS-yes)) |