[FFmpeg-soc] [soc]: r4230 - jpeg2000/j2kdec.c

[jai_menon]

Author: jai_menon
Date: Wed Apr 22 19:59:55 2009
New Revision: 4230

Log:
Modify decode_frame to use AVPacket as input. This fixes decoding with
FFmpeg SVN head.

Modified:
   jpeg2000/j2kdec.c

Modified: jpeg2000/j2kdec.c
==============================================================================
--- jpeg2000/j2kdec.c	Wed Apr 22 06:02:44 2009	(r4229)
+++ jpeg2000/j2kdec.c	Wed Apr 22 19:59:55 2009	(r4230)
@@ -886,7 +886,7 @@ static int decode_codestream(J2kDecoderC
 
 static int decode_frame(AVCodecContext *avctx,
                         void *data, int *data_size,
-                        uint8_t *buf, int buf_size)
+                        AVPacket *avpkt)
 {
     J2kDecoderContext *s = avctx->priv_data;
     AVFrame *picture = data;
@@ -896,8 +896,8 @@ static int decode_frame(AVCodecContext *
     av_log(s->avctx, AV_LOG_DEBUG, "start\n");
 
     // init
-    s->buf = s->buf_start = buf;
-    s->buf_end = buf + buf_size;
+    s->buf = s->buf_start = avpkt->data;
+    s->buf_end = s->buf_start + avpkt->size;
     s->curtileno = -1;
 
     ff_j2k_init_tier1_luts();