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
e2820d99
Commit
e2820d99
authored
Oct 22, 2012
by
Paul B Mahol
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
pnmdec: use more meaningful error codes
Signed-off-by:
Paul B Mahol
<
onemda@gmail.com
>
parent
5442c6cc
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
8 deletions
+8
-8
pnmdec.c
libavcodec/pnmdec.c
+8
-8
No files found.
libavcodec/pnmdec.c
View file @
e2820d99
...
...
@@ -34,29 +34,29 @@ static int pnm_decode_frame(AVCodecContext *avctx, void *data,
AVFrame
*
const
p
=
&
s
->
picture
;
int
i
,
j
,
n
,
linesize
,
h
,
upgrade
=
0
,
is_mono
=
0
;
unsigned
char
*
ptr
;
int
components
,
sample_len
;
int
components
,
sample_len
,
ret
;
s
->
bytestream_start
=
s
->
bytestream
=
(
uint8_t
*
)
buf
;
s
->
bytestream_end
=
(
uint8_t
*
)
buf
+
buf_size
;
if
(
ff_pnm_decode_header
(
avctx
,
s
)
<
0
)
return
-
1
;
return
AVERROR_INVALIDDATA
;
if
(
p
->
data
[
0
])
avctx
->
release_buffer
(
avctx
,
p
);
p
->
reference
=
0
;
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
;
p
->
key_frame
=
1
;
switch
(
avctx
->
pix_fmt
)
{
default:
return
-
1
;
return
AVERROR_INVALIDDATA
;
case
AV_PIX_FMT_RGBA64BE
:
n
=
avctx
->
width
*
8
;
components
=
4
;
...
...
@@ -107,7 +107,7 @@ static int pnm_decode_frame(AVCodecContext *avctx, void *data,
ptr
=
p
->
data
[
0
];
linesize
=
p
->
linesize
[
0
];
if
(
s
->
bytestream
+
n
*
avctx
->
height
>
s
->
bytestream_end
)
return
-
1
;
return
AVERROR_INVALIDDATA
;
if
(
s
->
type
<
4
||
(
is_mono
&&
s
->
type
==
7
)){
for
(
i
=
0
;
i
<
avctx
->
height
;
i
++
)
{
PutBitContext
pb
;
...
...
@@ -119,7 +119,7 @@ static int pnm_decode_frame(AVCodecContext *avctx, void *data,
while
(
s
->
bytestream
<
s
->
bytestream_end
&&
(
*
s
->
bytestream
<
'0'
||
*
s
->
bytestream
>
'9'
))
s
->
bytestream
++
;
if
(
s
->
bytestream
>=
s
->
bytestream_end
)
return
-
1
;
return
AVERROR_INVALIDDATA
;
if
(
is_mono
)
{
/* read a single digit */
v
=
(
*
s
->
bytestream
++
)
&
1
;
...
...
@@ -163,7 +163,7 @@ static int pnm_decode_frame(AVCodecContext *avctx, void *data,
ptr
=
p
->
data
[
0
];
linesize
=
p
->
linesize
[
0
];
if
(
s
->
bytestream
+
n
*
avctx
->
height
*
3
/
2
>
s
->
bytestream_end
)
return
-
1
;
return
AVERROR_INVALIDDATA
;
for
(
i
=
0
;
i
<
avctx
->
height
;
i
++
)
{
memcpy
(
ptr
,
s
->
bytestream
,
n
);
s
->
bytestream
+=
n
;
...
...
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