[FFmpeg-cvslog] Merge commit '7b6aae23e12f41cdfac7f1069debfe44d9a3d136'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Aug 22 19:52:49 2014 +0200| [ce1059d5c9098d4c2f89288653198b2c03ea8f85] | committer: Michael Niedermayer

Merge commit '7b6aae23e12f41cdfac7f1069debfe44d9a3d136'

* commit '7b6aae23e12f41cdfac7f1069debfe44d9a3d136':
  electronicarts: read the framerate for MAD

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

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