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
4ec14ce1
Commit
4ec14ce1
authored
Jun 15, 2015
by
Michael Niedermayer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
avcodec/jpeg2000dec: Improve readability of SOP check
Signed-off-by:
Michael Niedermayer
<
michaelni@gmx.at
>
parent
9ba5fe7f
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
2 deletions
+5
-2
jpeg2000.h
libavcodec/jpeg2000.h
+3
-0
jpeg2000dec.c
libavcodec/jpeg2000dec.c
+2
-2
No files found.
libavcodec/jpeg2000.h
View file @
4ec14ce1
...
...
@@ -58,6 +58,9 @@ enum Jpeg2000Markers {
JPEG2000_EOC
=
0xffd9
,
// end of codestream
};
#define JPEG2000_SOP_FIXED_BYTES 0xFF910004
#define JPEG2000_SOP_BYTE_LENGTH 6
enum
Jpeg2000Quantsty
{
// quantization style
JPEG2000_QSTY_NONE
,
// no quantization
JPEG2000_QSTY_SI
,
// scalar derived
...
...
libavcodec/jpeg2000dec.c
View file @
4ec14ce1
...
...
@@ -812,8 +812,8 @@ static int jpeg2000_decode_packet(Jpeg2000DecoderContext *s, Jpeg2000Tile *tile,
}
}
if
(
bytestream2_peek_be32
(
&
s
->
g
)
==
0xFF910004
)
bytestream2_skip
(
&
s
->
g
,
6
);
if
(
bytestream2_peek_be32
(
&
s
->
g
)
==
JPEG2000_SOP_FIXED_BYTES
)
bytestream2_skip
(
&
s
->
g
,
JPEG2000_SOP_BYTE_LENGTH
);
if
(
!
(
ret
=
get_bits
(
s
,
1
)))
{
jpeg2000_flush
(
s
);
...
...
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