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
b4e516e3
Commit
b4e516e3
authored
Oct 10, 2012
by
Paul B Mahol
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
pcx: use meaningful return values
Signed-off-by:
Paul B Mahol
<
onemda@gmail.com
>
parent
25f44b04
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
7 deletions
+8
-7
pcx.c
libavcodec/pcx.c
+8
-7
No files found.
libavcodec/pcx.c
View file @
b4e516e3
...
...
@@ -93,7 +93,7 @@ static int pcx_decode_frame(AVCodecContext *avctx, void *data, int *data_size,
if
(
buf
[
0
]
!=
0x0a
||
buf
[
1
]
>
5
)
{
av_log
(
avctx
,
AV_LOG_ERROR
,
"this is not PCX encoded data
\n
"
);
return
-
1
;
return
AVERROR_INVALIDDATA
;
}
compressed
=
buf
[
2
];
...
...
@@ -104,7 +104,7 @@ static int pcx_decode_frame(AVCodecContext *avctx, void *data, int *data_size,
if
(
xmax
<
xmin
||
ymax
<
ymin
)
{
av_log
(
avctx
,
AV_LOG_ERROR
,
"invalid image dimensions
\n
"
);
return
-
1
;
return
AVERROR_INVALIDDATA
;
}
w
=
xmax
-
xmin
+
1
;
...
...
@@ -117,7 +117,7 @@ static int pcx_decode_frame(AVCodecContext *avctx, void *data, int *data_size,
if
(
bytes_per_scanline
<
w
*
bits_per_pixel
*
nplanes
/
8
)
{
av_log
(
avctx
,
AV_LOG_ERROR
,
"PCX data is corrupted
\n
"
);
return
-
1
;
return
AVERROR_INVALIDDATA
;
}
switch
((
nplanes
<<
8
)
+
bits_per_pixel
)
{
...
...
@@ -135,7 +135,7 @@ static int pcx_decode_frame(AVCodecContext *avctx, void *data, int *data_size,
break
;
default:
av_log
(
avctx
,
AV_LOG_ERROR
,
"invalid PCX file
\n
"
);
return
-
1
;
return
AVERROR_INVALIDDATA
;
}
buf
+=
128
;
...
...
@@ -144,12 +144,12 @@ static int pcx_decode_frame(AVCodecContext *avctx, void *data, int *data_size,
avctx
->
release_buffer
(
avctx
,
p
);
if
(
av_image_check_size
(
w
,
h
,
0
,
avctx
))
return
-
1
;
return
AVERROR_INVALIDDATA
;
if
(
w
!=
avctx
->
width
||
h
!=
avctx
->
height
)
avcodec_set_dimensions
(
avctx
,
w
,
h
);
if
(
avctx
->
get_buffer
(
avctx
,
p
)
<
0
)
{
if
(
(
ret
=
avctx
->
get_buffer
(
avctx
,
p
)
)
<
0
)
{
av_log
(
avctx
,
AV_LOG_ERROR
,
"get_buffer() failed
\n
"
);
return
-
1
;
return
ret
;
}
p
->
pict_type
=
AV_PICTURE_TYPE_I
;
...
...
@@ -188,6 +188,7 @@ static int pcx_decode_frame(AVCodecContext *avctx, void *data, int *data_size,
}
if
(
*
buf
++
!=
12
)
{
av_log
(
avctx
,
AV_LOG_ERROR
,
"expected palette after image data
\n
"
);
ret
=
AVERROR_INVALIDDATA
;
goto
end
;
}
...
...
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