shithub: libvpx

Download patch

ref: f91a099fd49c79364d3bcc2bd0fbfe6398ec0187
parent: 005fc6970b4c1997d40b98d2ac01d34f39310606
parent: 64279307c4b5321dfb2cde317cc12c52b2c60106
author: Dmitry Kovalev <dkovalev@google.com>
date: Thu Feb 6 07:50:16 EST 2014 

Merge "Using vpx_codec_err_t instead of int."


--- 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);
--- 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;
-- 
⑨