ref: bef320aa0759c37e99e8dfd657e740fc58160835
parent: b85367a6084c72348167516f130edfe222c1ee0c
parent: 735b3a710a29ff08e1b9ed68612afe425c21c544
author: James Zern <[email protected]>
date: Fri Aug 23 07:01:27 EDT 2013
Merge "vpx_scale: correct pixel spelling"
--- a/vpx_scale/generic/yv12extend.c
+++ b/vpx_scale/generic/yv12extend.c
@@ -134,8 +134,8 @@
void vp9_extend_frame_inner_borders_c(YV12_BUFFER_CONFIG *ybf,
int subsampling_x, int subsampling_y) {
- const int inner_bw = ybf->border > VP9INNERBORDERINPIXLES ?
- VP9INNERBORDERINPIXLES : ybf->border;
+ const int inner_bw = ybf->border > VP9INNERBORDERINPIXELS ?
+ VP9INNERBORDERINPIXELS : ybf->border;
extend_frame(ybf, subsampling_x, subsampling_y, inner_bw);
}
#endif
--- a/vpx_scale/yv12config.h
+++ b/vpx_scale/yv12config.h
@@ -18,7 +18,7 @@
#include "vpx/vpx_integer.h"
#define VP8BORDERINPIXELS 32
-#define VP9INNERBORDERINPIXLES 96
+#define VP9INNERBORDERINPIXELS 96
#define VP9BORDERINPIXELS 160
#define VP9_INTERP_EXTEND 4