[FFmpeg-cvslog] Merge commit '061c489895d29049a88dc6118e4b639a273b31d6'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Feb 23 21:29:35 2015 +0100| [cce8f750d91c013da00f5191ad537450172acc0c] | committer: Michael Niedermayer

Merge commit '061c489895d29049a88dc6118e4b639a273b31d6'

* commit '061c489895d29049a88dc6118e4b639a273b31d6':
  eamad: check for out of bounds read

Conflicts:
	libavcodec/eamad.c

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

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