ref: b3345f462f8b59483dd3679b2f990439eed73460
parent: 53a0ed84ac4e2f19da619fb6263fd3dfaefc3484
parent: 8ef2ce86644e6a97c2847a1428f4fc97e10e1f87
author: Tom Finegan <tomfinegan@google.com>
date: Fri Dec 12 11:14:57 EST 2014
Merge "vpxdec: Rename the libyuv scale wrapper."
--- a/vpxdec.c
+++ b/vpxdec.c
@@ -131,7 +131,7 @@
#endif
#if CONFIG_LIBYUV
-static INLINE int vpx_image_scale(vpx_image_t *src, vpx_image_t *dst,
+static INLINE int libyuv_scale(vpx_image_t *src, vpx_image_t *dst,
FilterModeEnum mode) {#if CONFIG_VP9 && CONFIG_VP9_HIGHBITDEPTH
if (src->fmt == VPX_IMG_FMT_I42016) {@@ -948,7 +948,7 @@
if (img->d_w != scaled_img->d_w || img->d_h != scaled_img->d_h) {#if CONFIG_LIBYUV
- vpx_image_scale(img, scaled_img, kFilterBox);
+ libyuv_scale(img, scaled_img, kFilterBox);
img = scaled_img;
#else
fprintf(stderr, "Failed to scale output frame: %s.\n"