Add MxPEG decoder

[ffmpeg] / libavcodec / eatqi.c

diff --git a/libavcodec/eatqi.c b/libavcodec/eatqi.c
index 2a62402345359ed3a5d8c294a15a74543d3b6828..44792f04831e8a42f6111ee3be931828183dbc22 100644 (file)
--- a/libavcodec/eatqi.c
+++ b/libavcodec/eatqi.c
@@ -20,7 +20,7 @@
  */
 
 /**
- * @file eatqi.c
+ * @file
  * Electronic Arts TQI Video Decoder
  * by Peter Ross <pross@xvid.org>
  *
@@ -29,7 +29,7 @@
  */
 
 #include "avcodec.h"
-#include "bitstream.h"
+#include "get_bits.h"
 #include "dsputil.h"
 #include "aandcttab.h"
 #include "mpeg12.h"
@@ -40,6 +40,7 @@ typedef struct TqiContext {
     AVFrame frame;
     void *bitstream_buf;
     unsigned int bitstream_buf_size;
+    DECLARE_ALIGNED(16, DCTELEM, block)[6][64];
 } TqiContext;
 
 static av_cold int tqi_decode_init(AVCodecContext *avctx)
@@ -108,7 +109,6 @@ static int tqi_decode_frame(AVCodecContext *avctx,
     const uint8_t *buf_end = buf+buf_size;
     TqiContext *t = avctx->priv_data;
     MpegEncContext *s = &t->s;
-    DECLARE_ALIGNED_16(DCTELEM, block[6][64]);
 
     s->width  = AV_RL16(&buf[0]);
     s->height = AV_RL16(&buf[2]);
@@ -136,8 +136,8 @@ static int tqi_decode_frame(AVCodecContext *avctx,
     for (s->mb_y=0; s->mb_y<(avctx->height+15)/16; s->mb_y++)
     for (s->mb_x=0; s->mb_x<(avctx->width+15)/16; s->mb_x++)
     {
-        tqi_decode_mb(s, block);
-        tqi_idct_put(t, block);
+        tqi_decode_mb(s, t->block);
+        tqi_idct_put(t, t->block);
     }
 
     *data_size = sizeof(AVFrame);
@@ -154,9 +154,9 @@ static av_cold int tqi_decode_end(AVCodecContext *avctx)
     return 0;
 }
 
-AVCodec eatqi_decoder = {
+AVCodec ff_eatqi_decoder = {
     "eatqi",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_TQI,
     sizeof(TqiContext),
     tqi_decode_init,