diff --git a/configure b/configure
index 58b1050aed..b2ef48519b 100755
--- a/configure
+++ b/configure
@@ -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
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 @@