diff --git a/build/make/Makefile b/build/make/Makefile index 62d139ea4..5e3c904d9 100755 --- a/build/make/Makefile +++ b/build/make/Makefile @@ -255,7 +255,7 @@ ifeq ($(filter clean,$(MAKECMDGOALS)),) endif # -# Configuration dependant rules +# Configuration dependent rules # $(call pairmap,install_map_templates,$(INSTALL_MAPS)) @@ -332,7 +332,7 @@ ifneq ($(call enabled,DIST-SRCS),) DIST-SRCS-$(CONFIG_MSVS) += build/x86-msvs/yasm.rules DIST-SRCS-$(CONFIG_RVCT) += build/make/armlink_adapter.sh # - # This isn't really ARCH_ARM dependent, it's dependant on whether we're + # This isn't really ARCH_ARM dependent, it's dependent on whether we're # using assembly code or not (CONFIG_OPTIMIZATIONS maybe). Just use # this for now. DIST-SRCS-$(ARCH_ARM) += build/make/obj_int_extract.c diff --git a/build/make/configure.sh b/build/make/configure.sh index d504008a4..a48fd9faf 100755 --- a/build/make/configure.sh +++ b/build/make/configure.sh @@ -83,7 +83,7 @@ Build options: ${toggle_werror} treat warnings as errors, if possible (not available with all compilers) ${toggle_optimizations} turn on/off compiler optimization flags - ${toggle_pic} turn on/off Position Independant Code + ${toggle_pic} turn on/off Position Independent Code ${toggle_ccache} turn on/off compiler cache ${toggle_debug} enable/disable debug mode ${toggle_gprof} enable/disable gprof profiling instrumentation @@ -957,7 +957,7 @@ process_common_toolchain() { enabled small && check_add_cflags -O2 || check_add_cflags -O3 fi - # Position Independant Code (PIC) support, for building relocatable + # Position Independent Code (PIC) support, for building relocatable # shared objects enabled gcc && enabled pic && check_add_cflags -fPIC diff --git a/vpx/vpx_codec.h b/vpx/vpx_codec.h index 4d58bf869..d92e165ff 100644 --- a/vpx/vpx_codec.h +++ b/vpx/vpx_codec.h @@ -498,7 +498,7 @@ extern "C" { * Iterates over a list of the segments to allocate. The iterator storage * should be initialized to NULL to start the iteration. Iteration is complete * when this function returns VPX_CODEC_LIST_END. The amount of memory needed to - * allocate is dependant upon the size of the encoded stream. In cases where the + * allocate is dependent upon the size of the encoded stream. In cases where the * stream is not available at allocation time, a fixed size must be requested. * The codec will not be able to operate on streams larger than the size used at * allocation time. diff --git a/vpx/vpx_decoder_compat.h b/vpx/vpx_decoder_compat.h index 0fec32777..8adc1b998 100644 --- a/vpx/vpx_decoder_compat.h +++ b/vpx/vpx_decoder_compat.h @@ -527,7 +527,7 @@ extern "C" { * Iterates over a list of the segments to allocate. The iterator storage * should be initialized to NULL to start the iteration. Iteration is complete * when this function returns VPX_DEC_LIST_END. The amount of memory needed to - * allocate is dependant upon the size of the encoded stream. This means that + * allocate is dependent upon the size of the encoded stream. This means that * the stream info structure must be known at allocation time. It can be * populated with the vpx_dec_peek_stream_info() function. In cases where the * stream to be decoded is not available at allocation time, a fixed size must diff --git a/vpx_scale/arm/scalesystemdependant.c b/vpx_scale/arm/scalesystemdependent.c similarity index 100% rename from vpx_scale/arm/scalesystemdependant.c rename to vpx_scale/arm/scalesystemdependent.c diff --git a/vpx_scale/generic/scalesystemdependant.c b/vpx_scale/generic/scalesystemdependent.c similarity index 100% rename from vpx_scale/generic/scalesystemdependant.c rename to vpx_scale/generic/scalesystemdependent.c diff --git a/vpx_scale/vpx_scale.mk b/vpx_scale/vpx_scale.mk index f4ab258ed..edb5419c3 100644 --- a/vpx_scale/vpx_scale.mk +++ b/vpx_scale/vpx_scale.mk @@ -6,13 +6,13 @@ SCALE_SRCS-yes += vpxscale.h SCALE_SRCS-yes += generic/vpxscale.c SCALE_SRCS-yes += generic/yv12config.c SCALE_SRCS-yes += generic/yv12extend.c -SCALE_SRCS-yes += generic/scalesystemdependant.c +SCALE_SRCS-yes += generic/scalesystemdependent.c SCALE_SRCS-$(CONFIG_SPATIAL_RESAMPLING) += generic/gen_scalers.c #arm -SCALE_SRCS-$(HAVE_ARMV7) += arm/scalesystemdependant.c +SCALE_SRCS-$(HAVE_ARMV7) += arm/scalesystemdependent.c SCALE_SRCS-$(HAVE_ARMV7) += arm/yv12extend_arm.c -SCALE_SRCS_REMOVE-$(HAVE_ARMV7) += generic/scalesystemdependant.c +SCALE_SRCS_REMOVE-$(HAVE_ARMV7) += generic/scalesystemdependent.c #neon SCALE_SRCS-$(HAVE_ARMV7) += arm/neon/vp8_vpxyv12_copyframe_func_neon$(ASM) diff --git a/vpx_scale/win32/scalesystemdependant.c b/vpx_scale/win32/scalesystemdependent.c similarity index 97% rename from vpx_scale/win32/scalesystemdependant.c rename to vpx_scale/win32/scalesystemdependent.c index eab741f83..19e61c3a5 100644 --- a/vpx_scale/win32/scalesystemdependant.c +++ b/vpx_scale/win32/scalesystemdependent.c @@ -11,9 +11,9 @@ /**************************************************************************** * -* Module Title : system_dependant.c +* Module Title : system_dependent.c * -* Description : Miscellaneous system dependant functions +* Description : Miscellaneous system dependent functions * ****************************************************************************/