[FFmpeg-cvslog] j2kdec: move s->avctx initialization to j2kdec_init()

[Paul B Mahol]

ffmpeg | branch: master | Paul B Mahol <onemda at gmail.com> | Tue Mar 27 16:35:09 2012 +0000| [be32145e9da7b8a7150011ba98bf411fd720c060] | committer: Paul B Mahol

j2kdec: move s->avctx initialization to j2kdec_init()

Signed-off-by: Paul B Mahol <onemda at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=be32145e9da7b8a7150011ba98bf411fd720c060
---

 libavcodec/j2kdec.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/j2kdec.c b/libavcodec/j2kdec.c
index 59c2188..39e07c3 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;