Merge commit '218aefce4472dc02ee3f12830a9a894bf7916da9'

* commit '218aefce4472dc02ee3f12830a9a894bf7916da9':
  dsputil: Move LOCAL_ALIGNED macros to libavutil

Conflicts:
	libavcodec/dvdec.c
	libavcodec/imc.c
	libavcodec/mpegvideo_motion.c

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

diff --cc libavcodec/aacps.c
Simple merge

diff --cc libavcodec/aacsbr.c
index 4b6d34f89f7e7a1111b7d3a8ce5ecb9eb11634e9,0d0e23d83f8c54324cc93eab12d404865dfaad9b..d746b6ea49f1b7ff7cf971b69036070457dd7c00
--- 1/libavcodec/aacsbr.c
--- 2/libavcodec/aacsbr.c
+++ b/libavcodec/aacsbr.c
@@@ -33,8 -33,8 +33,9 @@@
  #include "fft.h"
  #include "aacps.h"
  #include "sbrdsp.h"
+ #include "libavutil/internal.h"
  #include "libavutil/libm.h"
 +#include "libavutil/avassert.h"
  
  #include <stdint.h>
  #include <float.h>

diff --cc libavcodec/ac3enc.c
Simple merge

diff --cc libavcodec/ac3enc_template.c
Simple merge

diff --cc libavcodec/bink.c
Simple merge

diff --cc libavcodec/dcadec.c
Simple merge

diff --cc libavcodec/dnxhdenc.c
Simple merge

diff --cc libavcodec/dsputil.c
Simple merge

diff --cc libavcodec/dsputil.h
Simple merge

diff --cc libavcodec/dv.c
Simple merge

diff --cc libavcodec/dvdec.c
index bb60fc0b13aad51b577f86beed154799ae5210ad,441deadaab2ce2d29b92d5bd2f0ae4985c0504ec..64d2259a7b6c738d83ef700b4b4aedf09c01bffb
--- 1/libavcodec/dvdec.c
--- 2/libavcodec/dvdec.c
+++ b/libavcodec/dvdec.c
@@@ -35,10 -35,9 +35,10 @@@
   * DV decoder
   */
  
 +#include "libavutil/avassert.h"
+ #include "libavutil/internal.h"
  #include "libavutil/pixdesc.h"
  #include "avcodec.h"
- #include "dsputil.h"
  #include "internal.h"
  #include "get_bits.h"
  #include "put_bits.h"

diff --cc libavcodec/h264_loopfilter.c
Simple merge

diff --cc libavcodec/imc.c
index a09e3c5d9fee558935ec1c3e1114b3d40d6ae954,909fa476318693b2128900232a959d22dd37bbe8..c127b2559ef5043a7dee814f92c4e42c674d7aeb
--- 1/libavcodec/imc.c
--- 2/libavcodec/imc.c
+++ b/libavcodec/imc.c
@@@ -37,7 -37,7 +37,8 @@@
  
  #include "libavutil/channel_layout.h"
  #include "libavutil/float_dsp.h"
+ #include "libavutil/internal.h"
 +#include "libavutil/libm.h"
  #include "avcodec.h"
  #include "get_bits.h"
  #include "dsputil.h"

diff --cc libavcodec/ituh263dec.c
Simple merge

diff --cc libavcodec/mpc7.c
Simple merge

diff --cc libavcodec/mpegvideo_enc.c
Simple merge

diff --cc libavcodec/mpegvideo_motion.c
index 22381dea273889a6c7e59a5def62a635bd9e9f10,24507a457565d0b0626a947752118d151a9936d5..565f6cb286693a593eeaa5e61f6036c2d1837fbb
--- 1/libavcodec/mpegvideo_motion.c
--- 2/libavcodec/mpegvideo_motion.c
+++ b/libavcodec/mpegvideo_motion.c
@@@ -22,7 -22,8 +22,9 @@@
   */
  
  #include <string.h>
+ 
 +#include "libavutil/avassert.h"
+ #include "libavutil/internal.h"
  #include "avcodec.h"
  #include "dsputil.h"
  #include "mpegvideo.h"

diff --cc libavcodec/ppc/mpegaudiodec_altivec.c
Simple merge

diff --cc libavcodec/ra288.c
Simple merge

diff --cc libavcodec/rv34.c
Simple merge

diff --cc libavcodec/simple_idct.c
Simple merge

diff --cc libavcodec/takdec.c
Simple merge

diff --cc libavcodec/x86/mpegaudiodec.c
index ee93a84956534ce532e48cebc2b99ef1ae69b330,79a29ce506b063a5acf307fab356e8d50e2841ba..287d8ff1268ec0f706257fe5e5385bbe1e0556f9
--- 1/libavcodec/x86/mpegaudiodec.c
--- 2/libavcodec/x86/mpegaudiodec.c
+++ b/libavcodec/x86/mpegaudiodec.c
@@@ -21,21 -21,16 +21,21 @@@
  
  #include "libavutil/attributes.h"
  #include "libavutil/cpu.h"
+ #include "libavutil/internal.h"
  #include "libavutil/x86/asm.h"
  #include "libavutil/x86/cpu.h"
- #include "libavcodec/dsputil.h"
  #include "libavcodec/mpegaudiodsp.h"
  
 -void ff_imdct36_float_sse(float *out, float *buf, float *in, float *win);
 -void ff_imdct36_float_sse2(float *out, float *buf, float *in, float *win);
 -void ff_imdct36_float_sse3(float *out, float *buf, float *in, float *win);
 -void ff_imdct36_float_ssse3(float *out, float *buf, float *in, float *win);
 -void ff_imdct36_float_avx(float *out, float *buf, float *in, float *win);
 +#define DECL(CPU)\
 +static void imdct36_blocks_ ## CPU(float *out, float *buf, float *in, int count, int switch_point, int block_type);\
 +void ff_imdct36_float_ ## CPU(float *out, float *buf, float *in, float *win);
 +
 +DECL(sse)
 +DECL(sse2)
 +DECL(sse3)
 +DECL(ssse3)
 +DECL(avx)
 +
  void ff_four_imdct36_float_sse(float *out, float *buf, float *in, float *win,
                                 float *tmpbuf);
  void ff_four_imdct36_float_avx(float *out, float *buf, float *in, float *win,

diff --cc libavutil/internal.h
Simple merge