[FFmpeg-cvslog] dsputil: fix ff_check_alignment()

Mans Rullgard git at videolan.org
Wed Jul 20 18:35:35 CEST 2011


ffmpeg | branch: master | Mans Rullgard <mans at mansr.com> | Tue Jul 19 10:20:56 2011 +0100| [29b42c66f70ec7f8bcac87cb3cb35ec13dc0c71e] | committer: Mans Rullgard

dsputil: fix ff_check_alignment()

The change to LOCAL_ALIGNED means the declared object must be an
array and the subsequent test should not use the & operator.

Noticed by Uoti Urpala.

Signed-off-by: Mans Rullgard <mans at mansr.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=29b42c66f70ec7f8bcac87cb3cb35ec13dc0c71e
---

 libavcodec/dsputil.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavcodec/dsputil.c b/libavcodec/dsputil.c
index f24985c..a3e8d6c 100644
--- a/libavcodec/dsputil.c
+++ b/libavcodec/dsputil.c
@@ -2823,9 +2823,9 @@ av_cold void dsputil_static_init(void)
 
 int ff_check_alignment(void){
     static int did_fail=0;
-    LOCAL_ALIGNED_16(int, aligned);
+    LOCAL_ALIGNED_16(int, aligned, [4]);
 
-    if((intptr_t)&aligned & 15){
+    if((intptr_t)aligned & 15){
         if(!did_fail){
 #if HAVE_MMX || HAVE_ALTIVEC
             av_log(NULL, AV_LOG_ERROR,



More information about the ffmpeg-cvslog mailing list