From a36d9a4a150c2f7e7eaa825d7ca0289aeac6c5b1 Mon Sep 17 00:00:00 2001
From: Johann <johannkoenig@google.com>
Date: Mon, 3 Dec 2012 16:23:49 -0800
Subject: [PATCH] Move vp8_scale_frame to vpx namespace
Change-Id: I92d613e89c8f1174eca0789116120bfa20c25c28
---
vp8/encoder/onyx_if.c | 2 +-
vpx_scale/generic/vpx_scale.c | 4 ++--
vpx_scale/vpx_scale.h | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/vp8/encoder/onyx_if.c b/vp8/encoder/onyx_if.c
index 575033c2d2..aa09a1e3ef 100644
--- a/vp8/encoder/onyx_if.c
+++ b/vp8/encoder/onyx_if.c
@@ -2599,7 +2599,7 @@ static void scale_and_extend_source(YV12_BUFFER_CONFIG *sd, VP8_COMP *cpi)
Scale2Ratio(cm->horiz_scale, &hr, &hs);
Scale2Ratio(cm->vert_scale, &vr, &vs);
- vp8_scale_frame(sd, &cpi->scaled_source, cm->temp_scale_frame.y_buffer,
+ vpx_scale_frame(sd, &cpi->scaled_source, cm->temp_scale_frame.y_buffer,
tmp_height, hs, hr, vs, vr, 0);
vp8_yv12_extend_frame_borders(&cpi->scaled_source);
diff --git a/vpx_scale/generic/vpx_scale.c b/vpx_scale/generic/vpx_scale.c
index c83c3b68fd..8044d2ad77 100644
--- a/vpx_scale/generic/vpx_scale.c
+++ b/vpx_scale/generic/vpx_scale.c
@@ -453,7 +453,7 @@ void Scale2D
/****************************************************************************
*
- * ROUTINE :
+ * ROUTINE : vpx_scale_frame
*
* INPUTS : YV12_BUFFER_CONFIG *src : Pointer to frame to be scaled.
* YV12_BUFFER_CONFIG *dst : Pointer to buffer to hold scaled frame.
@@ -475,7 +475,7 @@ void Scale2D
* caching.
*
****************************************************************************/
-void vp8_scale_frame
+void vpx_scale_frame
(
YV12_BUFFER_CONFIG *src,
YV12_BUFFER_CONFIG *dst,
diff --git a/vpx_scale/vpx_scale.h b/vpx_scale/vpx_scale.h
index 308b6aab68..9ddf62efd4 100644
--- a/vpx_scale/vpx_scale.h
+++ b/vpx_scale/vpx_scale.h
@@ -14,7 +14,7 @@
#include "vpx_scale/yv12config.h"
-extern void vp8_scale_frame(YV12_BUFFER_CONFIG *src,
+extern void vpx_scale_frame(YV12_BUFFER_CONFIG *src,
YV12_BUFFER_CONFIG *dst,
unsigned char *temp_area,
unsigned char temp_height,
--
GitLab