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)
commit6b2e65078c02cb1e09b555603a1eb10ddb3bd244
tree380272a56318a4153fce51926e1104de55fd262f
parent276c9c0577e99c870d4d281bc8f0df82b402efc4
parent218aefce4472dc02ee3f12830a9a894bf7916da9
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>
24 files changed:
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