diff options
author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-02-23 13:13:28 +0000 |
---|---|---|
committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-02-23 13:13:28 +0000 |
commit | ea427873781f6e6bbae9bc29426ec3136f9ddca3 (patch) | |
tree | b14cf325891d0b05f615d600da0233d6fb56a03c /libmpeg2 | |
parent | b8850a630dc8ef4ad3d98af65fc5cdbabf95c3b8 (diff) | |
download | mpv-ea427873781f6e6bbae9bc29426ec3136f9ddca3.tar.bz2 mpv-ea427873781f6e6bbae9bc29426ec3136f9ddca3.tar.xz |
#define ATTRIBUTE_ALIGNED_MAX in config.h instead of hardcoding it.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26075 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpeg2')
-rw-r--r-- | libmpeg2/attributes.h | 2 | ||||
-rw-r--r-- | libmpeg2/libmpeg-0.4.1.diff | 11 |
2 files changed, 1 insertions, 12 deletions
diff --git a/libmpeg2/attributes.h b/libmpeg2/attributes.h index ef3965c411..cbaf2c0e2a 100644 --- a/libmpeg2/attributes.h +++ b/libmpeg2/attributes.h @@ -29,7 +29,7 @@ #ifdef ATTRIBUTE_ALIGNED_MAX #define ATTR_ALIGN(align) __attribute__ ((__aligned__ ((ATTRIBUTE_ALIGNED_MAX < align) ? ATTRIBUTE_ALIGNED_MAX : align))) #else -#define ATTR_ALIGN(align) __attribute__ ((__aligned__ ((16 < align) ? 16 : align))) +#define ATTR_ALIGN(align) #endif #ifdef HAVE_BUILTIN_EXPECT diff --git a/libmpeg2/libmpeg-0.4.1.diff b/libmpeg2/libmpeg-0.4.1.diff index 8031709264..049ef2ea93 100644 --- a/libmpeg2/libmpeg-0.4.1.diff +++ b/libmpeg2/libmpeg-0.4.1.diff @@ -1,14 +1,3 @@ ---- include/attributes.h 2006-06-16 20:12:26.000000000 +0200 -+++ libmpeg2/attributes.h 2006-06-16 20:12:50.000000000 +0200 -@@ -25,7 +29,7 @@ - #ifdef ATTRIBUTE_ALIGNED_MAX - #define ATTR_ALIGN(align) __attribute__ ((__aligned__ ((ATTRIBUTE_ALIGNED_MAX < align) ? ATTRIBUTE_ALIGNED_MAX : align))) - #else --#define ATTR_ALIGN(align) -+#define ATTR_ALIGN(align) __attribute__ ((__aligned__ ((16 < align) ? 16 : align))) - #endif - - #ifdef HAVE_BUILTIN_EXPECT --- libmpeg2/cpu_accel.c 2006-06-16 20:12:26.000000000 +0200 +++ libmpeg2/cpu_accel.c 2006-06-16 20:12:50.000000000 +0200 @@ -22,6 +26,7 @@ |