Merge "Using vpx_codec_err_t instead of int."
This commit is contained in:
commit
f91a099fd4
@ -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);
|
||||
|
@ -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;
|
||||
|
Loading…
Reference in New Issue
Block a user