diff --git a/build/make/Makefile b/build/make/Makefile index 64d3c934b..a951e99bc 100755 --- a/build/make/Makefile +++ b/build/make/Makefile @@ -98,11 +98,11 @@ install:: $(BUILD_PFX)%.c.d: %.c $(if $(quiet),@echo " [DEP] $@") $(qexec)mkdir -p $(dir $@) - $(qexec)$(CC) $(CFLAGS) -M $< | $(fmt_deps) > $@ + $(qexec)$(CC) $(INTERNAL_CFLAGS) $(CFLAGS) -M $< | $(fmt_deps) > $@ $(BUILD_PFX)%.c.o: %.c $(if $(quiet),@echo " [CC] $@") - $(qexec)$(CC) $(CFLAGS) -c -o $@ $< + $(qexec)$(CC) $(INTERNAL_CFLAGS) $(CFLAGS) -c -o $@ $< $(BUILD_PFX)%.asm.d: %.asm $(if $(quiet),@echo " [DEP] $@") @@ -188,7 +188,7 @@ define linker_template $(1): $(filter-out -%,$(2)) $(1): $(if $(quiet),@echo " [LD] $$@") - $(qexec)$$(LD) $$(strip $$(LDFLAGS) -o $$@ $(2) $(3) $$(extralibs)) + $(qexec)$$(LD) $$(strip $$(INTERNAL_LDFLAGS) $$(LDFLAGS) -o $$@ $(2) $(3) $$(extralibs)) endef # make-3.80 has a bug with expanding large input strings to the eval function, # which was triggered in some cases by the following component of diff --git a/examples.mk b/examples.mk index 89c93db62..3e34b5697 100644 --- a/examples.mk +++ b/examples.mk @@ -122,8 +122,8 @@ else LIB_PATH := $(call enabled,LIB_PATH) INC_PATH := $(call enabled,INC_PATH) endif -CFLAGS += $(addprefix -I,$(INC_PATH)) -LDFLAGS += $(addprefix -L,$(LIB_PATH)) +INTERNAL_CFLAGS = $(addprefix -I,$(INC_PATH)) +INTERNAL_LDFLAGS += $(addprefix -L,$(LIB_PATH)) # Expand list of selected examples to build (as specified above) @@ -214,7 +214,8 @@ $(1): $($(1:.vcproj=).SRCS) --ver=$$(CONFIG_VS_VERSION)\ --proj-guid=$$($$(@:.vcproj=).GUID)\ $$(if $$(CONFIG_STATIC_MSVCRT),--static-crt) \ - --out=$$@ $$(CFLAGS) $$(LDFLAGS) -l$$(CODEC_LIB) -lwinmm $$^ + --out=$$@ $$(INTERNAL_CFLAGS) $$(CFLAGS) \ + $$(INTERNAL_LDFLAGS) $$(LDFLAGS) -l$$(CODEC_LIB) -lwinmm $$^ endef PROJECTS-$(CONFIG_MSVS) += $(ALL_EXAMPLES:.c=.vcproj) INSTALL-BINS-$(CONFIG_MSVS) += $(foreach p,$(VS_PLATFORMS),\ diff --git a/vp8/common/postproc.c b/vp8/common/postproc.c index 660880b52..7dbe96649 100644 --- a/vp8/common/postproc.c +++ b/vp8/common/postproc.c @@ -806,7 +806,7 @@ int vp8_post_proc_frame(VP8_COMMON *oci, YV12_BUFFER_CONFIG *dest, vp8_ppflags_t char zz[4]; int dc_diff = !(mi[mb_index].mbmi.mode != B_PRED && mi[mb_index].mbmi.mode != SPLITMV && - mi[mb_index].mbmi.mb_skip_coeff)); + mi[mb_index].mbmi.mb_skip_coeff); if (oci->frame_type == KEY_FRAME) sprintf(zz, "a"); diff --git a/vp8/common/x86/idctllm_mmx.asm b/vp8/common/x86/idctllm_mmx.asm index 43735bc4b..465626b8f 100644 --- a/vp8/common/x86/idctllm_mmx.asm +++ b/vp8/common/x86/idctllm_mmx.asm @@ -14,18 +14,18 @@ ; /**************************************************************************** ; * Notes: ; * -; * This implementation makes use of 16 bit fixed point verio of two multiply +; * This implementation makes use of 16 bit fixed point version of two multiply ; * constants: ; * 1. sqrt(2) * cos (pi/8) -; * 2. sqrt(2) * sin (pi/8) -; * Becuase the first constant is bigger than 1, to maintain the same 16 bit -; * fixed point prrcision as the second one, we use a trick of +; * 2. sqrt(2) * sin (pi/8) +; * Because the first constant is bigger than 1, to maintain the same 16 bit +; * fixed point precision as the second one, we use a trick of ; * x * a = x + x*(a-1) ; * so ; * x * sqrt(2) * cos (pi/8) = x + x * (sqrt(2) *cos(pi/8)-1). ; * -; * For the second constant, becuase of the 16bit version is 35468, which -; * is bigger than 32768, in signed 16 bit multiply, it become a negative +; * For the second constant, because of the 16bit version is 35468, which +; * is bigger than 32768, in signed 16 bit multiply, it becomes a negative ; * number. ; * (x * (unsigned)35468 >> 16) = x * (signed)35468 >> 16 + x ; *