Using vpx_codec_err_t instead of int. This fixes errors generated by c++ compiler. Change-Id: I0f792371790b5e6462b77c8d7fabab0db30b11eb
diff --git a/vpx/src/svc_encodeframe.c b/vpx/src/svc_encodeframe.c index 12f7166..5a8ba47 100644 --- a/vpx/src/svc_encodeframe.c +++ b/vpx/src/svc_encodeframe.c
@@ -272,7 +272,7 @@ char *save_ptr; int found = 0; int i, q; - int res = VPX_CODEC_OK; + vpx_codec_err_t res = VPX_CODEC_OK; SvcInternal *const si = get_svc_internal(svc_ctx); if (quantizer_values == NULL || strlen(quantizer_values) == 0) { @@ -322,7 +322,7 @@ int found = 0; int i; int64_t num, den; - int res = VPX_CODEC_OK; + vpx_codec_err_t res = VPX_CODEC_OK; SvcInternal *const si = get_svc_internal(svc_ctx); if (scale_factors == NULL || strlen(scale_factors) == 0) { @@ -381,7 +381,7 @@ char *option_name; char *option_value; char *input_ptr; - int res = VPX_CODEC_OK; + vpx_codec_err_t res = VPX_CODEC_OK; if (options == NULL) return VPX_CODEC_OK; input_string = strdup(options);
diff --git a/vpx/src/vpx_encoder.c b/vpx/src/vpx_encoder.c index 778ed2f..23742c8 100644 --- a/vpx/src/vpx_encoder.c +++ b/vpx/src/vpx_encoder.c
@@ -70,7 +70,7 @@ vpx_codec_flags_t flags, vpx_rational_t *dsf, int ver) { - vpx_codec_err_t res = 0; + vpx_codec_err_t res = VPX_CODEC_OK; if (ver != VPX_ENCODER_ABI_VERSION) res = VPX_CODEC_ABI_MISMATCH; @@ -207,7 +207,7 @@ unsigned long duration, vpx_enc_frame_flags_t flags, unsigned long deadline) { - vpx_codec_err_t res = 0; + vpx_codec_err_t res = VPX_CODEC_OK; if (!ctx || (img && !duration)) res = VPX_CODEC_INVALID_PARAM;