Message ID | 1310917392-64974-2-git-send-email-martin@martin.st |
---|---|
State | Committed |
Commit | 8f62ef0f95cd0bc915086a9d3d66b27fceb6916f |
Headers | show |
Hi, On Sun, Jul 17, 2011 at 8:43 AM, Martin Storsjö <martin@martin.st> wrote: > This avoids wasting a register if the stack isn't aligned on entry. > This makes this file compile properly with the x86 Android NDK > compiler, if --disable-aligned-stack is set. > --- > libavcodec/x86/mpegvideo_mmx_template.c | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/libavcodec/x86/mpegvideo_mmx_template.c b/libavcodec/x86/mpegvideo_mmx_template.c > index 0f01cb2..0b6cff3 100644 > --- a/libavcodec/x86/mpegvideo_mmx_template.c > +++ b/libavcodec/x86/mpegvideo_mmx_template.c > @@ -98,7 +98,7 @@ static int RENAME(dct_quantize)(MpegEncContext *s, > x86_reg last_non_zero_p1; > int level=0, q; //=0 is because gcc says uninitialized ... > const uint16_t *qmat, *bias; > - DECLARE_ALIGNED(16, int16_t, temp_block)[64]; > + LOCAL_ALIGNED_16(int16_t, temp_block, [64]); OK. Ronald
diff --git a/libavcodec/x86/mpegvideo_mmx_template.c b/libavcodec/x86/mpegvideo_mmx_template.c index 0f01cb2..0b6cff3 100644 --- a/libavcodec/x86/mpegvideo_mmx_template.c +++ b/libavcodec/x86/mpegvideo_mmx_template.c @@ -98,7 +98,7 @@ static int RENAME(dct_quantize)(MpegEncContext *s, x86_reg last_non_zero_p1; int level=0, q; //=0 is because gcc says uninitialized ... const uint16_t *qmat, *bias; - DECLARE_ALIGNED(16, int16_t, temp_block)[64]; + LOCAL_ALIGNED_16(int16_t, temp_block, [64]); assert((7&(int)(&temp_block[0])) == 0); //did gcc align it correctly?