[FFmpeg-cvslog] vp56: Don't use DECLARE_ALIGN on a typedef name

Derek Buitenhuis git at videolan.org
Tue Aug 28 15:09:05 CEST 2012


ffmpeg | branch: master | Derek Buitenhuis <derek.buitenhuis at gmail.com> | Sun Aug 26 22:09:10 2012 -0400| [61e262f6d7b86172d56b8363dfc105f70261d233] | committer: Michael Niedermayer

vp56: Don't use DECLARE_ALIGN on a typedef name

Instead, use it on the first member, since by definition, if
any member is aligned, the whole struct must be, in order to
maintain that alignment.

Fixes compilation with some finicky compilers, like a mix of libclang/msvc

Idea for fix from Måns Rullgård.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis at gmail.com>
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

 libavcodec/vp56.h |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavcodec/vp56.h b/libavcodec/vp56.h
index 12f9380..d8f7ce6 100644
--- a/libavcodec/vp56.h
+++ b/libavcodec/vp56.h
@@ -36,9 +36,9 @@
 typedef struct vp56_context VP56Context;
 
 typedef struct {
-    int16_t x;
+    DECLARE_ALIGNED(4, int16_t, x);
     int16_t y;
-} DECLARE_ALIGNED(4, , VP56mv);
+} VP56mv;
 
 typedef void (*VP56ParseVectorAdjustment)(VP56Context *s,
                                           VP56mv *vect);



More information about the ffmpeg-cvslog mailing list