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

Merge commit '70f9661542a581dfe93b636b1c55b5558e4a4e3c'

Browse Source 
* commit '70f9661542a581dfe93b636b1c55b5558e4a4e3c':
  jpeg2000dec: initialize static data just once

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2013-05-08 11:46:36 +02:00
parent aecb3421f6 70f9661542
commit 1bad40ef27
1 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
libavcodec/jpeg2000dec.c
View File

@@ -1265,8 +1265,6 @@ static int jpeg2000_decode_frame(AVCodecContext *avctx, void *data,
// reduction factor, i.e number of resolution levels to skip // reduction factor, i.e number of resolution levels to skip
s->reduction_factor = s->lowres; s->reduction_factor = s->lowres;
ff_jpeg2000_init_tier1_luts();
if (s->buf_end - s->buf < 2) if (s->buf_end - s->buf < 2)
return AVERROR(EINVAL); return AVERROR(EINVAL);
@@ -1313,6 +1311,11 @@ end:
return ret; return ret;
} }
static void jpeg2000_init_static_data(AVCodec *codec)
{
ff_jpeg2000_init_tier1_luts();
}
#define OFFSET(x) offsetof(Jpeg2000DecoderContext, x) #define OFFSET(x) offsetof(Jpeg2000DecoderContext, x)
#define VD AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_DECODING_PARAM #define VD AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_DECODING_PARAM
@@ -1339,16 +1342,17 @@ static const AVClass class = {
}; };
AVCodec ff_jpeg2000_decoder = { AVCodec ff_jpeg2000_decoder = {
.name = "jpeg2000", .name = "jpeg2000",
.long_name = NULL_IF_CONFIG_SMALL("JPEG 2000"), .long_name = NULL_IF_CONFIG_SMALL("JPEG 2000"),
.type = AVMEDIA_TYPE_VIDEO, .type = AVMEDIA_TYPE_VIDEO,
.id = AV_CODEC_ID_JPEG2000, .id = AV_CODEC_ID_JPEG2000,
.capabilities = CODEC_CAP_FRAME_THREADS, .capabilities = CODEC_CAP_FRAME_THREADS,
.priv_data_size = sizeof(Jpeg2000DecoderContext), .priv_data_size = sizeof(Jpeg2000DecoderContext),
.decode = jpeg2000_decode_frame, .init_static_data = jpeg2000_init_static_data,
.priv_class = &class, .decode = jpeg2000_decode_frame,
.pix_fmts = (enum PixelFormat[]) { AV_PIX_FMT_XYZ12, .priv_class = &class,
AV_PIX_FMT_GRAY8, .pix_fmts = (enum PixelFormat[]) { AV_PIX_FMT_XYZ12,
-1 }, AV_PIX_FMT_GRAY8,
.profiles = NULL_IF_CONFIG_SMALL(profiles) -1 },
.profiles = NULL_IF_CONFIG_SMALL(profiles)
}; };