diff options
author | Paul B Mahol <onemda@gmail.com> | 2012-03-27 20:35:09 +0400 |
---|---|---|
committer | Paul B Mahol <onemda@gmail.com> | 2012-06-15 16:10:25 +0400 |
commit | be32145e9da7b8a7150011ba98bf411fd720c060 (patch) | |
tree | 3d5a30bab57f20c8042f773bf1a6f2ad07351c93 /libavcodec | |
parent | 29e9f83192fd366f83a314adfb7892381c2280f5 (diff) |
j2kdec: move s->avctx initialization to j2kdec_init()
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Diffstat (limited to 'libavcodec')
-rw-r--r-- | libavcodec/j2kdec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/j2kdec.c b/libavcodec/j2kdec.c index 59c2188bb7..39e07c33c4 100644 --- a/libavcodec/j2kdec.c +++ b/libavcodec/j2kdec.c @@ -1021,7 +1021,6 @@ static int decode_frame(AVCodecContext *avctx, AVFrame *picture = data; int tileno, ret; - s->avctx = avctx; bytestream2_init(&s->g, avpkt->data, avpkt->size); s->curtileno = -1; @@ -1072,6 +1071,7 @@ static av_cold int j2kdec_init(AVCodecContext *avctx) { J2kDecoderContext *s = avctx->priv_data; + s->avctx = avctx; avcodec_get_frame_defaults((AVFrame*)&s->picture); avctx->coded_frame = (AVFrame*)&s->picture; |