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
56061234
Commit
56061234
authored
Sep 03, 2013
by
Michael Niedermayer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
avcodec/pictordec: remove y checks, which have become redundant
Signed-off-by:
Michael Niedermayer
<
michaelni@gmx.at
>
parent
8088d6f5
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
+3
-3
pictordec.c
libavcodec/pictordec.c
+3
-3
No files found.
libavcodec/pictordec.c
View file @
56061234
...
@@ -201,7 +201,7 @@ static int decode_frame(AVCodecContext *avctx,
...
@@ -201,7 +201,7 @@ static int decode_frame(AVCodecContext *avctx,
if
(
bytestream2_get_le16
(
&
s
->
g
))
{
if
(
bytestream2_get_le16
(
&
s
->
g
))
{
x
=
0
;
x
=
0
;
plane
=
0
;
plane
=
0
;
while
(
y
>=
0
&&
bytestream2_get_bytes_left
(
&
s
->
g
)
>=
6
)
{
while
(
bytestream2_get_bytes_left
(
&
s
->
g
)
>=
6
)
{
int
stop_size
,
marker
,
t1
,
t2
;
int
stop_size
,
marker
,
t1
,
t2
;
t1
=
bytestream2_get_bytes_left
(
&
s
->
g
);
t1
=
bytestream2_get_bytes_left
(
&
s
->
g
);
...
@@ -211,7 +211,7 @@ static int decode_frame(AVCodecContext *avctx,
...
@@ -211,7 +211,7 @@ static int decode_frame(AVCodecContext *avctx,
bytestream2_skip
(
&
s
->
g
,
2
);
bytestream2_skip
(
&
s
->
g
,
2
);
marker
=
bytestream2_get_byte
(
&
s
->
g
);
marker
=
bytestream2_get_byte
(
&
s
->
g
);
while
(
plane
<
s
->
nb_planes
&&
y
>=
0
&&
while
(
plane
<
s
->
nb_planes
&&
bytestream2_get_bytes_left
(
&
s
->
g
)
>
stop_size
)
{
bytestream2_get_bytes_left
(
&
s
->
g
)
>
stop_size
)
{
int
run
=
1
;
int
run
=
1
;
val
=
bytestream2_get_byte
(
&
s
->
g
);
val
=
bytestream2_get_byte
(
&
s
->
g
);
...
@@ -234,7 +234,7 @@ static int decode_frame(AVCodecContext *avctx,
...
@@ -234,7 +234,7 @@ static int decode_frame(AVCodecContext *avctx,
}
}
}
}
if
(
x
<
avctx
->
width
&&
y
>=
0
)
{
if
(
x
<
avctx
->
width
)
{
int
run
=
(
y
+
1
)
*
avctx
->
width
-
x
;
int
run
=
(
y
+
1
)
*
avctx
->
width
-
x
;
if
(
bits_per_plane
==
8
)
if
(
bits_per_plane
==
8
)
picmemset_8bpp
(
s
,
frame
,
val
,
run
,
&
x
,
&
y
);
picmemset_8bpp
(
s
,
frame
,
val
,
run
,
&
x
,
&
y
);
...
...
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