[FFmpeg-cvslog] Merge commit '284ea790d89441fa1e6b2d72d3c1ed6d61972f0b'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Nov 27 13:39:52 2012 +0100| [2684d2e3ea8a1a2863ae9842d072341b44b09829] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2684d2e3ea8a1a2863ae9842d072341b44b09829
---