Mercurial > mplayer.hg
changeset 26043:ad048f993f66
#define ATTRIBUTE_ALIGNED_MAX in config.h instead of hardcoding it.
| author | diego |
|---|---|
| date | Sat, 23 Feb 2008 13:13:28 +0000 |
| parents | bcfb485a8ade |
| children | 7a541b991b85 |
| files | configure libmpeg2/attributes.h libmpeg2/libmpeg-0.4.1.diff |
| diffstat | 3 files changed, 4 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/configure Sat Feb 23 12:47:19 2008 +0000 +++ b/configure Sat Feb 23 13:13:28 2008 +0000 @@ -8142,6 +8142,9 @@ /* 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
--- a/libmpeg2/attributes.h Sat Feb 23 12:47:19 2008 +0000 +++ b/libmpeg2/attributes.h Sat Feb 23 13:13:28 2008 +0000 @@ -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
--- a/libmpeg2/libmpeg-0.4.1.diff Sat Feb 23 12:47:19 2008 +0000 +++ b/libmpeg2/libmpeg-0.4.1.diff Sat Feb 23 13:13:28 2008 +0000 @@ -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 @@