Commit 0766291a authored by Reimar Döffinger's avatar Reimar Döffinger

Move "block" variable in rtjpeg decoder to context to ensure sufficient alignment

for idct_put on architectures/compilers that have problems aligning on the stack.

Originally committed as revision 18924 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 86b0e994
......@@ -98,7 +98,6 @@ static inline int get_block(GetBitContext *gb, DCTELEM *block, const uint8_t *sc
*/
int rtjpeg_decode_frame_yuv420(RTJpegContext *c, AVFrame *f,
const uint8_t *buf, int buf_size) {
DECLARE_ALIGNED_16(DCTELEM, block[64]);
GetBitContext gb;
int w = c->w / 16, h = c->h / 16;
int x, y;
......@@ -107,6 +106,7 @@ int rtjpeg_decode_frame_yuv420(RTJpegContext *c, AVFrame *f,
init_get_bits(&gb, buf, buf_size * 8);
for (y = 0; y < h; y++) {
for (x = 0; x < w; x++) {
DCTELEM *block = c->block;
if (get_block(&gb, block, c->scan, c->lquant))
c->dsp->idct_put(y1, f->linesize[0], block);
y1 += 8;
......
......@@ -31,6 +31,7 @@ typedef struct {
uint8_t scan[64];
uint32_t lquant[64];
uint32_t cquant[64];
DECLARE_ALIGNED_16(DCTELEM, block[64]);
} RTJpegContext;
void rtjpeg_decode_init(RTJpegContext *c, DSPContext *dsp,
......
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