Commit 1eda87ce authored by Reimar Döffinger's avatar Reimar Döffinger

eatqi: move "block" variable into context to ensure sufficient alignment for

idct_put for compilers/architectures that can not align stack variables that much.
This is also consistent with similar code in eatgq.c

Originally committed as revision 18927 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 77336b61
...@@ -40,6 +40,7 @@ typedef struct TqiContext { ...@@ -40,6 +40,7 @@ typedef struct TqiContext {
AVFrame frame; AVFrame frame;
void *bitstream_buf; void *bitstream_buf;
unsigned int bitstream_buf_size; unsigned int bitstream_buf_size;
DECLARE_ALIGNED_16(DCTELEM, block[6][64]);
} TqiContext; } TqiContext;
static av_cold int tqi_decode_init(AVCodecContext *avctx) static av_cold int tqi_decode_init(AVCodecContext *avctx)
...@@ -108,7 +109,6 @@ static int tqi_decode_frame(AVCodecContext *avctx, ...@@ -108,7 +109,6 @@ static int tqi_decode_frame(AVCodecContext *avctx,
const uint8_t *buf_end = buf+buf_size; const uint8_t *buf_end = buf+buf_size;
TqiContext *t = avctx->priv_data; TqiContext *t = avctx->priv_data;
MpegEncContext *s = &t->s; MpegEncContext *s = &t->s;
DECLARE_ALIGNED_16(DCTELEM, block[6][64]);
s->width = AV_RL16(&buf[0]); s->width = AV_RL16(&buf[0]);
s->height = AV_RL16(&buf[2]); s->height = AV_RL16(&buf[2]);
...@@ -136,8 +136,8 @@ static int tqi_decode_frame(AVCodecContext *avctx, ...@@ -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_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++) for (s->mb_x=0; s->mb_x<(avctx->width+15)/16; s->mb_x++)
{ {
tqi_decode_mb(s, block); tqi_decode_mb(s, t->block);
tqi_idct_put(t, block); tqi_idct_put(t, t->block);
} }
*data_size = sizeof(AVFrame); *data_size = sizeof(AVFrame);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment