summaryrefslogtreecommitdiff
path: root/vp8/encoder
diff options
context:
space:
mode:
authorJames Zern <jzern@google.com>2017-06-12 17:54:21 -0700
committerJames Zern <jzern@google.com>2017-06-12 20:13:23 -0700
commit98666368ee7f01a3344c1065abd8700b4002e275 (patch)
tree904df3c7de626d955a0881a2d53245ba3de8c2df /vp8/encoder
parent21e1661b54e6e25bdea4cc0b5c1c55f6df8245f2 (diff)
downloadlibvpx-98666368ee7f01a3344c1065abd8700b4002e275.tar
libvpx-98666368ee7f01a3344c1065abd8700b4002e275.tar.gz
libvpx-98666368ee7f01a3344c1065abd8700b4002e275.tar.bz2
libvpx-98666368ee7f01a3344c1065abd8700b4002e275.zip
rename vp8/common/skin_detection.[hc] -> vp8_*
some build systems have trouble with duplicate basenames. vpx_dsp/skin_detection.[hc] were added in: 658e85425 Merge skin detection code in vp8/9. BUG=webm:1438 Change-Id: Ieaa70b40bda409ec23e6d179b47a930ac6243b05
Diffstat (limited to 'vp8/encoder')
-rw-r--r--vp8/encoder/onyx_if.c2
-rw-r--r--vp8/encoder/pickinter.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/vp8/encoder/onyx_if.c b/vp8/encoder/onyx_if.c
index d5a534946..b8240af89 100644
--- a/vp8/encoder/onyx_if.c
+++ b/vp8/encoder/onyx_if.c
@@ -16,7 +16,7 @@
#include "vp8/common/blockd.h"
#include "onyx_int.h"
#include "vp8/common/systemdependent.h"
-#include "vp8/common/skin_detection.h"
+#include "vp8/common/vp8_skin_detection.h"
#include "vp8/encoder/quantize.h"
#include "vp8/common/alloccommon.h"
#include "mcomp.h"
diff --git a/vp8/encoder/pickinter.c b/vp8/encoder/pickinter.c
index 341068bb9..5b7f1f0c7 100644
--- a/vp8/encoder/pickinter.c
+++ b/vp8/encoder/pickinter.c
@@ -25,7 +25,7 @@
#include "vp8/common/reconintra4x4.h"
#include "vpx_dsp/variance.h"
#include "mcomp.h"
-#include "vp8/common/skin_detection.h"
+#include "vp8/common/vp8_skin_detection.h"
#include "rdopt.h"
#include "vpx_dsp/vpx_dsp_common.h"
#include "vpx_mem/vpx_mem.h"