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
ab7c6462
Commit
ab7c6462
authored
Jul 08, 2012
by
Paul B Mahol
Committed by
Vittorio Giovara
Mar 31, 2014
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
sgi: remove redundant argument from read_uncompressed_sgi()
parent
6d9ccee4
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
4 deletions
+3
-4
sgidec.c
libavcodec/sgidec.c
+3
-4
No files found.
libavcodec/sgidec.c
View file @
ab7c6462
...
@@ -118,16 +118,15 @@ static int read_rle_sgi(uint8_t *out_buf, SgiState *s)
...
@@ -118,16 +118,15 @@ static int read_rle_sgi(uint8_t *out_buf, SgiState *s)
/**
/**
* Read an uncompressed SGI image.
* Read an uncompressed SGI image.
* @param out_buf output buffer
* @param out_buf output buffer
* @param out_end end ofoutput buffer
* @param s the current image state
* @param s the current image state
* @return 0 if read success, otherwise return -1.
* @return 0 if read success, otherwise return -1.
*/
*/
static
int
read_uncompressed_sgi
(
unsigned
char
*
out_buf
,
uint8_t
*
out_end
,
static
int
read_uncompressed_sgi
(
unsigned
char
*
out_buf
,
SgiState
*
s
)
SgiState
*
s
)
{
{
int
x
,
y
,
z
;
int
x
,
y
,
z
;
unsigned
int
offset
=
s
->
height
*
s
->
width
*
s
->
bytes_per_channel
;
unsigned
int
offset
=
s
->
height
*
s
->
width
*
s
->
bytes_per_channel
;
GetByteContext
gp
[
4
];
GetByteContext
gp
[
4
];
uint8_t
*
out_end
;
/* Test buffer size. */
/* Test buffer size. */
if
(
offset
*
s
->
depth
>
bytestream2_get_bytes_left
(
&
s
->
g
))
if
(
offset
*
s
->
depth
>
bytestream2_get_bytes_left
(
&
s
->
g
))
...
@@ -228,7 +227,7 @@ static int decode_frame(AVCodecContext *avctx,
...
@@ -228,7 +227,7 @@ static int decode_frame(AVCodecContext *avctx,
if
(
rle
)
{
if
(
rle
)
{
ret
=
read_rle_sgi
(
out_end
,
s
);
ret
=
read_rle_sgi
(
out_end
,
s
);
}
else
{
}
else
{
ret
=
read_uncompressed_sgi
(
out_buf
,
out_end
,
s
);
ret
=
read_uncompressed_sgi
(
out_buf
,
s
);
}
}
if
(
ret
==
0
)
{
if
(
ret
==
0
)
{
...
...
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