Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Xiph.Org
aom-rav1e
Commits
f91a099f
Commit
f91a099f
authored
Feb 06, 2014
by
Dmitry Kovalev
Committed by
Gerrit Code Review
Feb 06, 2014
Browse files
Merge "Using vpx_codec_err_t instead of int."
parents
005fc697
64279307
Changes
2
Hide whitespace changes
Inline
Side-by-side
vpx/src/svc_encodeframe.c
View file @
f91a099f
...
...
@@ -272,7 +272,7 @@ static vpx_codec_err_t parse_quantizer_values(SvcContext *svc_ctx,
char
*
save_ptr
;
int
found
=
0
;
int
i
,
q
;
in
t
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
;
in
t
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
;
in
t
res
=
VPX_CODEC_OK
;
vpx_codec_err_
t
res
=
VPX_CODEC_OK
;
if
(
options
==
NULL
)
return
VPX_CODEC_OK
;
input_string
=
strdup
(
options
);
...
...
vpx/src/vpx_encoder.c
View file @
f91a099f
...
...
@@ -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
;
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment