Merge commit '284ea790d89441fa1e6b2d72d3c1ed6d61972f0b'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 27 Nov 2012 12:39:52 +0000 (13:39 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 27 Nov 2012 12:39:52 +0000 (13:39 +0100)
commit2684d2e3ea8a1a2863ae9842d072341b44b09829
tree3d116023d439f92f473480c8f68f6d27f9f62344
parent257196209fe7d27ad22e18bf5757ffcad47dce6b
parent284ea790d89441fa1e6b2d72d3c1ed6d61972f0b
Merge commit '284ea790d89441fa1e6b2d72d3c1ed6d61972f0b'

* commit '284ea790d89441fa1e6b2d72d3c1ed6d61972f0b':
  dsputil: move vector_fmul_scalar() to AVFloatDSPContext in libavutil
  aacenc: use the correct output buffer
  aacdec: fix signed overflows in lcg_random()
  base64: fix signed overflow in shift

Conflicts:
libavcodec/dsputil.c
libavutil/base64.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/aacdec.c
libavcodec/arm/dsputil_init_neon.c
libavcodec/arm/dsputil_neon.S
libavcodec/dsputil.c
libavcodec/dsputil.h
libavcodec/libmp3lame.c
libavcodec/wmaenc.c
libavcodec/wmaprodec.c
libavutil/float_dsp.c
libavutil/float_dsp.h