[MPlayer-cvslog] r26075 - in trunk: configure libmpeg2/attributes.h libmpeg2/libmpeg-0.4.1.diff

[diego]

Author: diego
Date: Sat Feb 23 14:13:28 2008
New Revision: 26075

Log:
#define ATTRIBUTE_ALIGNED_MAX in config.h instead of hardcoding it.


Modified:
   trunk/configure
   trunk/libmpeg2/attributes.h
   trunk/libmpeg2/libmpeg-0.4.1.diff

Modified: trunk/configure
==============================================================================
--- trunk/configure	(original)
+++ trunk/configure	Sat Feb 23 14:13:28 2008
@@ -8142,6 +8142,9 @@ $_def_dvdnav
 /* Define this to enable MPEG 1/2 image postprocessing (requires a FAST CPU!) */
 #define MPEG12_POSTPROC 1
 
+/* maximum alignment used by libmpeg2 */
+#define ATTRIBUTE_ALIGNED_MAX 16
+
 /* Define this to enable image postprocessing in libavcodec (requires a FAST CPU!) */
 $_def_libpostproc
 $_def_libpostproc_a

Modified: trunk/libmpeg2/attributes.h
==============================================================================
--- trunk/libmpeg2/attributes.h	(original)
+++ trunk/libmpeg2/attributes.h	Sat Feb 23 14:13:28 2008
@@ -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

Modified: trunk/libmpeg2/libmpeg-0.4.1.diff
==============================================================================
--- trunk/libmpeg2/libmpeg-0.4.1.diff	(original)
+++ trunk/libmpeg2/libmpeg-0.4.1.diff	Sat Feb 23 14:13:28 2008
@@ -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 @@