Mercurial > libavcodec.hg

changeset 9699:19c88aa29bec libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author reimar
date Sun, 24 May 2009 08:36:52 +0000
parents 9c9342d1ce14
children 1a8821c5d28d
files rtjpeg.c rtjpeg.h
diffstat 2 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/rtjpeg.c	Sun May 24 03:39:20 2009 +0000
+++ b/rtjpeg.c	Sun May 24 08:36:52 2009 +0000
@@ -98,7 +98,6 @@
  */
 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 @@
     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;
--- a/rtjpeg.h	Sun May 24 03:39:20 2009 +0000
+++ b/rtjpeg.h	Sun May 24 08:36:52 2009 +0000
@@ -31,6 +31,7 @@
     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,