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
1083808c
Commit
1083808c
authored
May 22, 2018
by
Carl Eugen Hoyos
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lavc/jpeg2000dec: Move a variable declaration closer to its usage.
parent
848ce6f0
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
1 deletion
+1
-1
jpeg2000dec.c
libavcodec/jpeg2000dec.c
+1
-1
No files found.
libavcodec/jpeg2000dec.c
View file @
1083808c
...
@@ -2053,7 +2053,6 @@ static int jp2_find_codestream(Jpeg2000DecoderContext *s)
...
@@ -2053,7 +2053,6 @@ static int jp2_find_codestream(Jpeg2000DecoderContext *s)
}
}
}
else
if
(
atom2
==
MKBETAG
(
'p'
,
'c'
,
'l'
,
'r'
)
&&
atom2_size
>=
6
)
{
}
else
if
(
atom2
==
MKBETAG
(
'p'
,
'c'
,
'l'
,
'r'
)
&&
atom2_size
>=
6
)
{
int
i
,
size
,
colour_count
,
colour_channels
,
colour_depth
[
3
];
int
i
,
size
,
colour_count
,
colour_channels
,
colour_depth
[
3
];
uint32_t
r
,
g
,
b
;
colour_count
=
bytestream2_get_be16u
(
&
s
->
g
);
colour_count
=
bytestream2_get_be16u
(
&
s
->
g
);
colour_channels
=
bytestream2_get_byteu
(
&
s
->
g
);
colour_channels
=
bytestream2_get_byteu
(
&
s
->
g
);
// FIXME: Do not ignore channel_sign
// FIXME: Do not ignore channel_sign
...
@@ -2075,6 +2074,7 @@ static int jp2_find_codestream(Jpeg2000DecoderContext *s)
...
@@ -2075,6 +2074,7 @@ static int jp2_find_codestream(Jpeg2000DecoderContext *s)
}
}
s
->
pal8
=
1
;
s
->
pal8
=
1
;
for
(
i
=
0
;
i
<
colour_count
;
i
++
)
{
for
(
i
=
0
;
i
<
colour_count
;
i
++
)
{
uint32_t
r
,
g
,
b
;
if
(
colour_depth
[
0
]
<=
8
)
{
if
(
colour_depth
[
0
]
<=
8
)
{
r
=
bytestream2_get_byteu
(
&
s
->
g
)
<<
8
-
colour_depth
[
0
];
r
=
bytestream2_get_byteu
(
&
s
->
g
)
<<
8
-
colour_depth
[
0
];
r
|=
r
>>
colour_depth
[
0
];
r
|=
r
>>
colour_depth
[
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