Merge remote-tracking branch 'qatar/master'

* qatar/master:
  doc/platform: Fix 10l typo
  dsputil: Move STRIDE_ALIGN macro to the only place it is used

Conflicts:
	libavcodec/dsputil.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>

diff --cc libavcodec/dsputil.h
index b27e5a62d6f20a70a42898648a19f4c8bb426700,f95077f0f473ce17249703f19c8bdf6184ba6f47..7d12fe3c7bdbc0a37771cb6603d8cb456be6a776
--- 1/libavcodec/dsputil.h
--- 2/libavcodec/dsputil.h
+++ b/libavcodec/dsputil.h
@@@ -402,12 -397,4 +402,6 @@@ void ff_dsputil_init_ppc(DSPContext* c
  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
- 
 +void ff_dsputil_init_dwt(DSPContext *c);
 +
  #endif /* AVCODEC_DSPUTIL_H */

diff --cc libavcodec/rectangle.h
index 43f89c9e0fb46352da60b535be5ea46a22e10bb8,f18f667ad3068d64a7cdc614fbe2bae8a2bd0ff6..2ce80e16082d93ed967c3d3738a82c8810e94750
--- 1/libavcodec/rectangle.h
--- 2/libavcodec/rectangle.h
+++ b/libavcodec/rectangle.h
@@@ -47,8 -47,7 +47,8 @@@ static av_always_inline void fill_recta
      w      *= size;
      stride *= size;
  
-     av_assert2((((long)vp)&(FFMIN(w, STRIDE_ALIGN)-1)) == 0);
 -    assert((stride&(w-1))==0);
++    av_assert2((((long)vp)&(FFMIN(w, 8<<(HAVE_NEON|ARCH_PPC|HAVE_MMX))-1)) == 0);
 +    av_assert2((stride&(w-1))==0);
      if(w==2){
          const uint16_t v= size==4 ? val : val*0x0101;
          *(uint16_t*)(p + 0*stride)= v;

diff --cc libavcodec/utils.c
index 0844b249eea8f62dcb7cd549b8ff7cd52e802aa5,86e154621b056000db921d2700bbf20b3f5d490d..569f2ff6e454a36bbcf2f2c168073d999e3151af
--- 1/libavcodec/utils.c
--- 2/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@@ -25,9 -25,9 +25,10 @@@
   * utils.
   */
  
+ #include "config.h"
  #include "libavutil/avassert.h"
  #include "libavutil/avstring.h"
 +#include "libavutil/bprint.h"
  #include "libavutil/channel_layout.h"
  #include "libavutil/crc.h"
  #include "libavutil/mathematics.h"