Merge commit '218aefce4472dc02ee3f12830a9a894bf7916da9'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 9 Feb 2013 13:33:57 +0000 (14:33 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 9 Feb 2013 13:33:57 +0000 (14:33 +0100)
* 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>
24 files changed:
1  2 
libavcodec/aacps.c
libavcodec/aacsbr.c
libavcodec/ac3enc.c
libavcodec/ac3enc_template.c
libavcodec/bink.c
libavcodec/dcadec.c
libavcodec/dnxhdenc.c
libavcodec/dsputil.c
libavcodec/dsputil.h
libavcodec/dv.c
libavcodec/dvdec.c
libavcodec/h264_loopfilter.c
libavcodec/imc.c
libavcodec/ituh263dec.c
libavcodec/mpc7.c
libavcodec/mpegvideo_enc.c
libavcodec/mpegvideo_motion.c
libavcodec/ppc/mpegaudiodec_altivec.c
libavcodec/ra288.c
libavcodec/rv34.c
libavcodec/simple_idct.c
libavcodec/takdec.c
libavcodec/x86/mpegaudiodec.c
libavutil/internal.h

Simple merge
@@@ -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>
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc libavcodec/dv.c
Simple merge
   * 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"
Simple merge
@@@ -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"
Simple merge
Simple merge
Simple merge
@@@ -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"
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
  
  #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,
Simple merge