From bec358d683954738488a7ea529a340e9b11931ef Mon Sep 17 00:00:00 2001 From: Alexander Strange Date: Wed, 20 Jan 2010 03:28:57 +0000 Subject: [PATCH] H.264: Declare bS with DECLARE_ALIGNED_8 for uint64_t casts. Originally committed as revision 21345 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/h264_loopfilter.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavcodec/h264_loopfilter.c b/libavcodec/h264_loopfilter.c index 1567a655b6..e05610e20c 100644 --- a/libavcodec/h264_loopfilter.c +++ b/libavcodec/h264_loopfilter.c @@ -456,7 +456,7 @@ static av_always_inline void filter_mb_dir(H264Context *h, int mb_x, int mb_y, u int j; for(j=0; j<2; j++, mbn_xy += s->mb_stride){ - int16_t bS[4]; + DECLARE_ALIGNED_8(int16_t, bS[4]); int qp; if( IS_INTRA(mb_type|s->current_picture.mb_type[mbn_xy]) ) { *(uint64_t*)bS= 0x0003000300030003ULL; @@ -487,7 +487,7 @@ static av_always_inline void filter_mb_dir(H264Context *h, int mb_x, int mb_y, u /* mbn_xy: neighbor macroblock */ const int mbn_xy = edge > 0 ? mb_xy : mbm_xy; const int mbn_type = s->current_picture.mb_type[mbn_xy]; - int16_t bS[4]; + DECLARE_ALIGNED_8(int16_t, bS[4]); int qp; if( (edge&1) && IS_8x8DCT(mb_type) ) @@ -631,7 +631,7 @@ void ff_h264_filter_mb( H264Context *h, int mb_x, int mb_y, uint8_t *img_y, uint */ const int pair_xy = mb_x + (mb_y&~1)*s->mb_stride; const int left_mb_xy[2] = { pair_xy-1, pair_xy-1+s->mb_stride }; - int16_t bS[8]; + DECLARE_ALIGNED_8(int16_t, bS[8]); int qp[2]; int bqp[2]; int rqp[2];