Commit bcf59b5d authored by Michael Niedermayer's avatar Michael Niedermayer

j2kdec: merge jpeg2000_init_static_data() from jpeg2000

Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent 5d67dfd7
......@@ -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"),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment