diff options
| author | Johann <johannkoenig@google.com> | 2012-12-03 14:19:49 -0800 |
|---|---|---|
| committer | Johann <johannkoenig@google.com> | 2012-12-05 16:05:44 -0800 |
| commit | 1009f76566524e88a322a8373ccc848128f8c201 (patch) | |
| tree | 865b86d446fc6e9c3ada39a2c6592c298c2f2e06 /vpx_scale | |
| parent | 74050401423d1925dd8aef299e9af5806b070c63 (diff) | |
| download | libvpx-1009f76566524e88a322a8373ccc848128f8c201.tar.gz libvpx-1009f76566524e88a322a8373ccc848128f8c201.tar.bz2 libvpx-1009f76566524e88a322a8373ccc848128f8c201.zip | |
Use 'vpx_scale' consistently
Change-Id: I178352813d2b8702d081caf405de9dbad9af2cc3
Diffstat (limited to 'vpx_scale')
| -rw-r--r-- | vpx_scale/generic/gen_scalers.c | 2 | ||||
| -rw-r--r-- | vpx_scale/generic/vpx_scale.c (renamed from vpx_scale/generic/vpxscale.c) | 0 | ||||
| -rw-r--r-- | vpx_scale/generic/yv12extend.c | 2 | ||||
| -rw-r--r-- | vpx_scale/vpx_scale.h (renamed from vpx_scale/vpxscale.h) | 0 | ||||
| -rw-r--r-- | vpx_scale/vpx_scale.mk | 4 | ||||
| -rw-r--r-- | vpx_scale/win32/scaleopt.c | 2 |
6 files changed, 5 insertions, 5 deletions
diff --git a/vpx_scale/generic/gen_scalers.c b/vpx_scale/generic/gen_scalers.c index febe97d94..5f355c5a6 100644 --- a/vpx_scale/generic/gen_scalers.c +++ b/vpx_scale/generic/gen_scalers.c @@ -9,7 +9,7 @@ */ -#include "vpx_scale/vpxscale.h" +#include "vpx_scale/vpx_scale.h" #include "vpx_mem/vpx_mem.h" /**************************************************************************** * Imports diff --git a/vpx_scale/generic/vpxscale.c b/vpx_scale/generic/vpx_scale.c index 49cdb7bc7..49cdb7bc7 100644 --- a/vpx_scale/generic/vpxscale.c +++ b/vpx_scale/generic/vpx_scale.c diff --git a/vpx_scale/generic/yv12extend.c b/vpx_scale/generic/yv12extend.c index 247078c0c..5a427356b 100644 --- a/vpx_scale/generic/yv12extend.c +++ b/vpx_scale/generic/yv12extend.c @@ -11,7 +11,7 @@ #include "vpx_scale/yv12config.h" #include "vpx_mem/vpx_mem.h" -#include "vpx_scale/vpxscale.h" +#include "vpx_scale/vpx_scale.h" /**************************************************************************** * Exports diff --git a/vpx_scale/vpxscale.h b/vpx_scale/vpx_scale.h index 308b6aab6..308b6aab6 100644 --- a/vpx_scale/vpxscale.h +++ b/vpx_scale/vpx_scale.h diff --git a/vpx_scale/vpx_scale.mk b/vpx_scale/vpx_scale.mk index 3d759327a..11d3fd96d 100644 --- a/vpx_scale/vpx_scale.mk +++ b/vpx_scale/vpx_scale.mk @@ -1,7 +1,7 @@ SCALE_SRCS-yes += vpx_scale.mk SCALE_SRCS-yes += yv12config.h -SCALE_SRCS-yes += vpxscale.h -SCALE_SRCS-yes += generic/vpxscale.c +SCALE_SRCS-yes += vpx_scale.h +SCALE_SRCS-yes += generic/vpx_scale.c SCALE_SRCS-yes += generic/yv12config.c SCALE_SRCS-yes += generic/yv12extend.c SCALE_SRCS-$(CONFIG_SPATIAL_RESAMPLING) += generic/gen_scalers.c diff --git a/vpx_scale/win32/scaleopt.c b/vpx_scale/win32/scaleopt.c index 54f9ac069..4336ecea3 100644 --- a/vpx_scale/win32/scaleopt.c +++ b/vpx_scale/win32/scaleopt.c @@ -23,7 +23,7 @@ ****************************************************************************/ __declspec(align(16)) const static unsigned short round_values[] = { 128, 128, 128, 128 }; -#include "vpx_scale/vpxscale.h" +#include "vpx_scale/vpx_scale.h" #include "vpx_mem/vpx_mem.h" __declspec(align(16)) const static unsigned short const54_2[] = { 0, 64, 128, 192 }; |