Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
F
ffmpeg.wasm-core
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Linshizhi
ffmpeg.wasm-core
Commits
7769be59
Commit
7769be59
authored
Feb 13, 2015
by
Himangi Saraogi
Committed by
Diego Biurrun
Feb 14, 2015
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
vp56: Return meaningful error codes
Signed-off-by:
Diego Biurrun
<
diego@biurrun.de
>
parent
eea769df
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
7 deletions
+8
-7
vp56.c
libavcodec/vp56.c
+8
-7
No files found.
libavcodec/vp56.c
View file @
7769be59
...
...
@@ -473,7 +473,7 @@ static int vp56_size_changed(AVCodecContext *avctx)
if
(
s
->
mb_width
>
1000
||
s
->
mb_height
>
1000
)
{
ff_set_dimensions
(
avctx
,
0
,
0
);
av_log
(
avctx
,
AV_LOG_ERROR
,
"picture too big
\n
"
);
return
-
1
;
return
AVERROR_INVALIDDATA
;
}
s
->
above_blocks
=
av_realloc
(
s
->
above_blocks
,
...
...
@@ -501,11 +501,11 @@ int ff_vp56_decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
if
(
s
->
has_alpha
)
{
if
(
remaining_buf_size
<
3
)
return
-
1
;
return
AVERROR_INVALIDDATA
;
alpha_offset
=
bytestream_get_be24
(
&
buf
);
remaining_buf_size
-=
3
;
if
(
remaining_buf_size
<
alpha_offset
)
return
-
1
;
return
AVERROR_INVALIDDATA
;
}
for
(
is_alpha
=
0
;
is_alpha
<
1
+
s
->
has_alpha
;
is_alpha
++
)
{
...
...
@@ -530,20 +530,21 @@ int ff_vp56_decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
av_frame_unref
(
s
->
frames
[
i
]);
if
(
is_alpha
)
{
ff_set_dimensions
(
avctx
,
0
,
0
);
return
-
1
;
return
AVERROR_INVALIDDATA
;
}
}
if
(
!
is_alpha
)
{
if
(
ff_get_buffer
(
avctx
,
p
,
AV_GET_BUFFER_FLAG_REF
)
<
0
)
{
int
ret
=
ff_get_buffer
(
avctx
,
p
,
AV_GET_BUFFER_FLAG_REF
);
if
(
ret
<
0
)
{
av_log
(
avctx
,
AV_LOG_ERROR
,
"get_buffer() failed
\n
"
);
return
-
1
;
return
ret
;
}
if
(
res
==
VP56_SIZE_CHANGE
)
if
(
vp56_size_changed
(
avctx
))
{
av_frame_unref
(
p
);
return
-
1
;
return
AVERROR_INVALIDDATA
;
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a 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