]> granicus.if.org Git - libvpx/commitdiff
Fixing clang warning.
authorDmitry Kovalev <dkovalev@google.com>
Tue, 29 Oct 2013 21:50:27 +0000 (14:50 -0700)
committerDmitry Kovalev <dkovalev@google.com>
Tue, 29 Oct 2013 21:50:27 +0000 (14:50 -0700)
Warning was: "implicit conversion from enumeration type 'VPX_SCALING_MODE'
(aka 'enum vpx_scaling_mode_1d') to different enumeration type
'VPX_SCALING'".

Change-Id: I45689e439a8775bc1e7534d0ea1ff7c729f2c7f5

vp9/vp9_cx_iface.c

index 0f12d8870b827b98d8e2e6ec42bbdac3c14ceaa9..4d3967059a5970dea7f348f9e3cbbae640a8a564 100644 (file)
@@ -995,8 +995,9 @@ static vpx_codec_err_t vp9e_set_scalemode(vpx_codec_alg_priv_t *ctx,
   if (data) {
     int res;
     vpx_scaling_mode_t scalemode = *(vpx_scaling_mode_t *)data;
-    res = vp9_set_internal_size(ctx->cpi, scalemode.h_scaling_mode,
-                                scalemode.v_scaling_mode);
+    res = vp9_set_internal_size(ctx->cpi,
+                                (VPX_SCALING)scalemode.h_scaling_mode,
+                                (VPX_SCALING)scalemode.v_scaling_mode);
 
     if (!res) {
       return VPX_CODEC_OK;