From 64279307c4b5321dfb2cde317cc12c52b2c60106 Mon Sep 17 00:00:00 2001
From: Dmitry Kovalev <dkovalev@google.com>
Date: Thu, 6 Feb 2014 11:25:57 -0800
Subject: [PATCH] Using vpx_codec_err_t instead of int.

This fixes errors generated by c++ compiler.

Change-Id: I0f792371790b5e6462b77c8d7fabab0db30b11eb
---
 vpx/src/svc_encodeframe.c | 6 +++---
 vpx/src/vpx_encoder.c     | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/vpx/src/svc_encodeframe.c b/vpx/src/svc_encodeframe.c
index 12f7166c3..5a8ba475b 100644
--- a/vpx/src/svc_encodeframe.c
+++ b/vpx/src/svc_encodeframe.c
@@ -272,7 +272,7 @@ static vpx_codec_err_t parse_quantizer_values(SvcContext *svc_ctx,
   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 @@ static vpx_codec_err_t parse_scale_factors(SvcContext *svc_ctx,
   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 @@ static vpx_codec_err_t parse_options(SvcContext *svc_ctx, const char *options) {
   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 778ed2f0e..23742c8e8 100644
--- a/vpx/src/vpx_encoder.c
+++ b/vpx/src/vpx_encoder.c
@@ -70,7 +70,7 @@ vpx_codec_err_t vpx_codec_enc_init_multi_ver(vpx_codec_ctx_t      *ctx,
                                              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 @@ vpx_codec_err_t  vpx_codec_encode(vpx_codec_ctx_t            *ctx,
                                   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;