diff options
| author | Frank Galligan <fgalligan@google.com> | 2013-01-11 15:34:05 -0800 |
|---|---|---|
| committer | Frank Galligan <fgalligan@google.com> | 2013-01-11 15:37:23 -0800 |
| commit | bc45f2319299913cce714be97db8297ca6ee639e (patch) | |
| tree | 2906074434c1c0438c78ba04101cf4dcef353a68 | |
| parent | d27ae620bce34ebb4a78502ad7b10d14f491b216 (diff) | |
| download | libvpx-bc45f2319299913cce714be97db8297ca6ee639e.tar libvpx-bc45f2319299913cce714be97db8297ca6ee639e.tar.gz libvpx-bc45f2319299913cce714be97db8297ca6ee639e.tar.bz2 libvpx-bc45f2319299913cce714be97db8297ca6ee639e.zip | |
Upstream changes from Chromium Android Clang build.
See https://codereview.chromium.org/11875006/
Change-Id: Ied2a17df2b3222635f84aef120eaa9feb53750d2
| -rw-r--r-- | vp8/encoder/onyx_if.c | 2 | ||||
| -rw-r--r-- | vp8/vp8_cx_iface.c | 4 | ||||
| -rw-r--r-- | vp9/vp9_dx_iface.c | 6 |
3 files changed, 8 insertions, 4 deletions
diff --git a/vp8/encoder/onyx_if.c b/vp8/encoder/onyx_if.c index 6858d411d..7eb7193bf 100644 --- a/vp8/encoder/onyx_if.c +++ b/vp8/encoder/onyx_if.c @@ -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; } diff --git a/vp8/vp8_cx_iface.c b/vp8/vp8_cx_iface.c index 83eecba5c..b985cb1b7 100644 --- a/vp8/vp8_cx_iface.c +++ b/vp8/vp8_cx_iface.c @@ -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) { diff --git a/vp9/vp9_dx_iface.c b/vp9/vp9_dx_iface.c index 321fdb9e0..2d7e41369 100644 --- a/vp9/vp9_dx_iface.c +++ b/vp9/vp9_dx_iface.c @@ -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; |