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
bcf59b5d
Commit
bcf59b5d
authored
May 26, 2013
by
Michael Niedermayer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
j2kdec: merge jpeg2000_init_static_data() from jpeg2000
Signed-off-by:
Michael Niedermayer
<
michaelni@gmx.at
>
parent
5d67dfd7
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
6 deletions
+2
-6
j2kdec.c
libavcodec/j2kdec.c
+2
-6
No files found.
libavcodec/j2kdec.c
View file @
bcf59b5d
...
...
@@ -1083,13 +1083,9 @@ err_out:
return
ret
;
}
static
av_cold
int
j2kdec_init
(
AVCodecContext
*
avctx
)
static
void
jpeg2000_init_static_data
(
AVCodec
*
codec
)
{
Jpeg2000DecoderContext
*
s
=
avctx
->
priv_data
;
ff_jpeg2000_init_tier1_luts
();
return
0
;
}
AVCodec
ff_j2k_decoder
=
{
...
...
@@ -1097,7 +1093,7 @@ AVCodec ff_j2k_decoder = {
.
type
=
AVMEDIA_TYPE_VIDEO
,
.
id
=
AV_CODEC_ID_JPEG2000
,
.
priv_data_size
=
sizeof
(
Jpeg2000DecoderContext
),
.
init
=
j2kdec_init
,
.
init
_static_data
=
jpeg2000_init_static_data
,
.
decode
=
decode_frame
,
.
capabilities
=
CODEC_CAP_EXPERIMENTAL
|
CODEC_CAP_FRAME_THREADS
,
.
long_name
=
NULL_IF_CONFIG_SMALL
(
"JPEG 2000"
),
...
...
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