Commit 385bea68 authored by Jim Bankoski's avatar Jim Bankoski Committed by Gerrit Code Review

Merge "Upstream changes from Chromium Android Clang build." into experimental

parents bbe1c925 bc45f231
......@@ -3466,7 +3466,7 @@ static void encode_frame_to_data_rate
/* Note that we should not throw out a key frame (especially when
* spatial resampling is enabled).
*/
if ((cm->frame_type == KEY_FRAME))
if (cm->frame_type == KEY_FRAME)
{
cpi->decimation_count = cpi->decimation_factor;
}
......
......@@ -1178,7 +1178,9 @@ static vpx_codec_err_t vp8e_set_scalemode(vpx_codec_alg_priv_t *ctx,
{
int res;
vpx_scaling_mode_t scalemode = *(vpx_scaling_mode_t *)data ;
res = vp8_set_internal_size(ctx->cpi, scalemode.h_scaling_mode, scalemode.v_scaling_mode);
res = vp8_set_internal_size(ctx->cpi,
(VPX_SCALING)scalemode.h_scaling_mode,
(VPX_SCALING)scalemode.v_scaling_mode);
if (!res)
{
......
......@@ -573,7 +573,8 @@ static vpx_codec_err_t vp9_set_reference(vpx_codec_alg_priv_t *ctx,
image2yuvconfig(&frame->img, &sd);
return vp9_set_reference_dec(ctx->pbi, frame->frame_type, &sd);
return vp9_set_reference_dec(ctx->pbi,
(VP9_REFFRAME)frame->frame_type, &sd);
} else
return VPX_CODEC_INVALID_PARAM;
......@@ -591,7 +592,8 @@ static vpx_codec_err_t vp9_get_reference(vpx_codec_alg_priv_t *ctx,
image2yuvconfig(&frame->img, &sd);
return vp9_get_reference_dec(ctx->pbi, frame->frame_type, &sd);
return vp9_get_reference_dec(ctx->pbi,
(VP9_REFFRAME)frame->frame_type, &sd);
} else
return VPX_CODEC_INVALID_PARAM;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment