[FFmpeg-cvslog] Merge commit '0eb8786eac1f4a2132ad80dc49f90d5f81665c5c' into release/2.2

[Michael Niedermayer]

ffmpeg | branch: release/2.2 | Michael Niedermayer <michaelni at gmx.at> | Mon Mar  9 13:00:10 2015 +0100| [51c580102d4d189d657bd322372e663fcf756cdd] | committer: Michael Niedermayer

Merge commit '0eb8786eac1f4a2132ad80dc49f90d5f81665c5c' into release/2.2

* commit '0eb8786eac1f4a2132ad80dc49f90d5f81665c5c':
  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=51c580102d4d189d657bd322372e663fcf756cdd
---