[FFmpeg-cvslog] Merge commit '8542f9c4f17125d483c40c0c5723842f1c982f81'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Apr  4 22:52:12 2014 +0200| [c1d053621c2c437505c22321e12b2d2e71976a00] | committer: Michael Niedermayer

Merge commit '8542f9c4f17125d483c40c0c5723842f1c982f81'

* commit '8542f9c4f17125d483c40c0c5723842f1c982f81':
  replaygain: correctly parse peak values

Conflicts:
	libavutil/version.h

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

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