Commit f91a099f authored by Dmitry Kovalev's avatar Dmitry Kovalev Committed by Gerrit Code Review
Browse files

Merge "Using vpx_codec_err_t instead of int."

parents 005fc697 64279307
...@@ -272,7 +272,7 @@ static vpx_codec_err_t parse_quantizer_values(SvcContext *svc_ctx, ...@@ -272,7 +272,7 @@ static vpx_codec_err_t parse_quantizer_values(SvcContext *svc_ctx,
char *save_ptr; char *save_ptr;
int found = 0; int found = 0;
int i, q; int i, q;
int res = VPX_CODEC_OK; vpx_codec_err_t res = VPX_CODEC_OK;
SvcInternal *const si = get_svc_internal(svc_ctx); SvcInternal *const si = get_svc_internal(svc_ctx);
if (quantizer_values == NULL || strlen(quantizer_values) == 0) { if (quantizer_values == NULL || strlen(quantizer_values) == 0) {
...@@ -322,7 +322,7 @@ static vpx_codec_err_t parse_scale_factors(SvcContext *svc_ctx, ...@@ -322,7 +322,7 @@ static vpx_codec_err_t parse_scale_factors(SvcContext *svc_ctx,
int found = 0; int found = 0;
int i; int i;
int64_t num, den; 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); SvcInternal *const si = get_svc_internal(svc_ctx);
if (scale_factors == NULL || strlen(scale_factors) == 0) { 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) { ...@@ -381,7 +381,7 @@ static vpx_codec_err_t parse_options(SvcContext *svc_ctx, const char *options) {
char *option_name; char *option_name;
char *option_value; char *option_value;
char *input_ptr; char *input_ptr;
int res = VPX_CODEC_OK; vpx_codec_err_t res = VPX_CODEC_OK;
if (options == NULL) return VPX_CODEC_OK; if (options == NULL) return VPX_CODEC_OK;
input_string = strdup(options); input_string = strdup(options);
......
...@@ -70,7 +70,7 @@ vpx_codec_err_t vpx_codec_enc_init_multi_ver(vpx_codec_ctx_t *ctx, ...@@ -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_codec_flags_t flags,
vpx_rational_t *dsf, vpx_rational_t *dsf,
int ver) { int ver) {
vpx_codec_err_t res = 0; vpx_codec_err_t res = VPX_CODEC_OK;
if (ver != VPX_ENCODER_ABI_VERSION) if (ver != VPX_ENCODER_ABI_VERSION)
res = VPX_CODEC_ABI_MISMATCH; res = VPX_CODEC_ABI_MISMATCH;
...@@ -207,7 +207,7 @@ vpx_codec_err_t vpx_codec_encode(vpx_codec_ctx_t *ctx, ...@@ -207,7 +207,7 @@ vpx_codec_err_t vpx_codec_encode(vpx_codec_ctx_t *ctx,
unsigned long duration, unsigned long duration,
vpx_enc_frame_flags_t flags, vpx_enc_frame_flags_t flags,
unsigned long deadline) { unsigned long deadline) {
vpx_codec_err_t res = 0; vpx_codec_err_t res = VPX_CODEC_OK;
if (!ctx || (img && !duration)) if (!ctx || (img && !duration))
res = VPX_CODEC_INVALID_PARAM; res = VPX_CODEC_INVALID_PARAM;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment