generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

j2kdec: merge jpeg2000_init_static_data() from jpeg2000

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-05-26 18:27:53 +02:00
parent 5d67dfd71c
commit bcf59b5d8f
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/j2kdec.c
View File

@ -1083,13 +1083,9 @@ err_out:
return ret; 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(); ff_jpeg2000_init_tier1_luts();
return 0;
} }
AVCodec ff_j2k_decoder = { AVCodec ff_j2k_decoder = {
@ -1097,7 +1093,7 @@ AVCodec ff_j2k_decoder = {
.type = AVMEDIA_TYPE_VIDEO, .type = AVMEDIA_TYPE_VIDEO,
.id = AV_CODEC_ID_JPEG2000, .id = AV_CODEC_ID_JPEG2000,
.priv_data_size = sizeof(Jpeg2000DecoderContext), .priv_data_size = sizeof(Jpeg2000DecoderContext),
.init = j2kdec_init, .init_static_data = jpeg2000_init_static_data,
.decode = decode_frame, .decode = decode_frame,
.capabilities = CODEC_CAP_EXPERIMENTAL | CODEC_CAP_FRAME_THREADS, .capabilities = CODEC_CAP_EXPERIMENTAL | CODEC_CAP_FRAME_THREADS,
.long_name = NULL_IF_CONFIG_SMALL("JPEG 2000"), .long_name = NULL_IF_CONFIG_SMALL("JPEG 2000"),