From c6507946d428ee082676d5917fbb3eb0d1d7eb2e Mon Sep 17 00:00:00 2001
From: Diego Biurrun <diego@biurrun.de>
Date: Fri, 8 Feb 2013 15:55:52 +0100
Subject: [PATCH 1/2] dsputil: Move STRIDE_ALIGN macro to the only place it is
 used

---
 libavcodec/dsputil.h | 6 ------
 libavcodec/utils.c   | 7 +++++++
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/libavcodec/dsputil.h b/libavcodec/dsputil.h
index 4b697ef9fa..f95077f0f4 100644
--- a/libavcodec/dsputil.h
+++ b/libavcodec/dsputil.h
@@ -397,10 +397,4 @@ void ff_dsputil_init_ppc(DSPContext* c, AVCodecContext *avctx);
 void ff_dsputil_init_sh4(DSPContext* c, AVCodecContext *avctx);
 void ff_dsputil_init_vis(DSPContext* c, AVCodecContext *avctx);
 
-#if (ARCH_ARM && HAVE_NEON) || ARCH_PPC || HAVE_MMX
-#   define STRIDE_ALIGN 16
-#else
-#   define STRIDE_ALIGN 8
-#endif
-
 #endif /* AVCODEC_DSPUTIL_H */
diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index 19c8a99ff5..86e154621b 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -25,6 +25,7 @@
  * utils.
  */
 
+#include "config.h"
 #include "libavutil/avassert.h"
 #include "libavutil/avstring.h"
 #include "libavutil/channel_layout.h"
@@ -156,6 +157,12 @@ void avcodec_set_dimensions(AVCodecContext *s, int width, int height)
 
 #define INTERNAL_BUFFER_SIZE (32 + 1)
 
+#if (ARCH_ARM && HAVE_NEON) || ARCH_PPC || HAVE_MMX
+#   define STRIDE_ALIGN 16
+#else
+#   define STRIDE_ALIGN 8
+#endif
+
 void avcodec_align_dimensions2(AVCodecContext *s, int *width, int *height,
                                int linesize_align[AV_NUM_DATA_POINTERS])
 {

From 130cefc9dcedea5babc349251fbeec6f037144ac Mon Sep 17 00:00:00 2001
From: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Date: Wed, 13 Feb 2013 18:41:37 -0500
Subject: [PATCH 2/2] doc/platform: Fix 10l typo

This error was somehow missed for months.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
---
 doc/platform.texi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/platform.texi b/doc/platform.texi
index 999a5f19f1..da08962e01 100644
--- a/doc/platform.texi
+++ b/doc/platform.texi
@@ -137,7 +137,7 @@ make
 make install
 @end example
 
-If you wish to compile static libraries, add @code{--enable-shared} to your
+If you wish to compile shared libraries, add @code{--enable-shared} to your
 configure options. Note that due to the way MSVC handles DLL imports and
 exports, you cannot compile static and shared libraries at the same time, and
 enabling shared libraries will automatically disable the static ones.