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
7104c4dd
Commit
7104c4dd
authored
Apr 09, 2020
by
Andreas Rheinhardt
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
avcodec/jpeg2000dec: Fix mixed declaration and code
Signed-off-by:
Andreas Rheinhardt
<
andreas.rheinhardt@gmail.com
>
parent
a39536ca
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
2 deletions
+3
-2
jpeg2000dec.c
libavcodec/jpeg2000dec.c
+3
-2
No files found.
libavcodec/jpeg2000dec.c
View file @
7104c4dd
...
@@ -862,6 +862,7 @@ static int get_plt(Jpeg2000DecoderContext *s, int n)
...
@@ -862,6 +862,7 @@ static int get_plt(Jpeg2000DecoderContext *s, int n)
static
int
get_ppt
(
Jpeg2000DecoderContext
*
s
,
int
n
)
static
int
get_ppt
(
Jpeg2000DecoderContext
*
s
,
int
n
)
{
{
Jpeg2000Tile
*
tile
;
Jpeg2000Tile
*
tile
;
void
*
new
;
if
(
n
<
3
)
{
if
(
n
<
3
)
{
av_log
(
s
->
avctx
,
AV_LOG_ERROR
,
"Invalid length for PPT data.
\n
"
);
av_log
(
s
->
avctx
,
AV_LOG_ERROR
,
"Invalid length for PPT data.
\n
"
);
...
@@ -879,8 +880,8 @@ static int get_ppt(Jpeg2000DecoderContext *s, int n)
...
@@ -879,8 +880,8 @@ static int get_ppt(Jpeg2000DecoderContext *s, int n)
tile
->
has_ppt
=
1
;
// this tile has a ppt marker
tile
->
has_ppt
=
1
;
// this tile has a ppt marker
bytestream2_get_byte
(
&
s
->
g
);
// Zppt is skipped and not used
bytestream2_get_byte
(
&
s
->
g
);
// Zppt is skipped and not used
void
*
new
=
av_realloc
(
tile
->
packed_headers
,
new
=
av_realloc
(
tile
->
packed_headers
,
tile
->
packed_headers_size
+
n
-
3
);
tile
->
packed_headers_size
+
n
-
3
);
if
(
new
)
{
if
(
new
)
{
tile
->
packed_headers
=
new
;
tile
->
packed_headers
=
new
;
}
else
}
else
...
...
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