ref: e1acea5a2843deb8628e9211ae2ff40cdc1818e7
parent: 4c7e8b55a6a68cd7968966c67c0135faf7cea9d9
parent: 2f9aec0e65472a058b2581f220280a42d035af67
author: James Zern <jzern@google.com>
date: Mon Aug 6 15:24:31 EDT 2018
Merge "vpxenc: replace uint16 with uint16_t"
--- a/vpxenc.c
+++ b/vpxenc.c
@@ -1615,14 +1615,14 @@
vpx_img_alloc(NULL, VPX_IMG_FMT_I42016, cfg->g_w, cfg->g_h, 16);
}
I420Scale_16(
- (uint16 *)img->planes[VPX_PLANE_Y], img->stride[VPX_PLANE_Y] / 2,
- (uint16 *)img->planes[VPX_PLANE_U], img->stride[VPX_PLANE_U] / 2,
- (uint16 *)img->planes[VPX_PLANE_V], img->stride[VPX_PLANE_V] / 2,
- img->d_w, img->d_h, (uint16 *)stream->img->planes[VPX_PLANE_Y],
+ (uint16_t *)img->planes[VPX_PLANE_Y], img->stride[VPX_PLANE_Y] / 2,
+ (uint16_t *)img->planes[VPX_PLANE_U], img->stride[VPX_PLANE_U] / 2,
+ (uint16_t *)img->planes[VPX_PLANE_V], img->stride[VPX_PLANE_V] / 2,
+ img->d_w, img->d_h, (uint16_t *)stream->img->planes[VPX_PLANE_Y],
stream->img->stride[VPX_PLANE_Y] / 2,
- (uint16 *)stream->img->planes[VPX_PLANE_U],
+ (uint16_t *)stream->img->planes[VPX_PLANE_U],
stream->img->stride[VPX_PLANE_U] / 2,
- (uint16 *)stream->img->planes[VPX_PLANE_V],
+ (uint16_t *)stream->img->planes[VPX_PLANE_V],
stream->img->stride[VPX_PLANE_V] / 2, stream->img->d_w,
stream->img->d_h, kFilterBox);
img = stream->img;