Merge commit '8542f9c4f17125d483c40c0c5723842f1c982f81'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 4 Apr 2014 20:52:12 +0000 (22:52 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 4 Apr 2014 20:52:12 +0000 (22:52 +0200)
commitc1d053621c2c437505c22321e12b2d2e71976a00
treefe12c2e130fe792324ef0408184bb82acd981c24
parent652061313979b99f91b27309ecd8baeef7b7865f
parent8542f9c4f17125d483c40c0c5723842f1c982f81
Merge commit '8542f9c4f17125d483c40c0c5723842f1c982f81'

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

Conflicts:
libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
doc/APIchanges
libavformat/replaygain.c
libavutil/replaygain.h
libavutil/version.h