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)
* commit '8542f9c4f17125d483c40c0c5723842f1c982f81':
  replaygain: correctly parse peak values

Conflicts:
libavutil/version.h

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

diff --cc doc/APIchanges
Simple merge
Simple merge
Simple merge
@@@ -55,9 -53,9 +55,9 @@@
   * @{
   */
  
 -#define LIBAVUTIL_VERSION_MAJOR 53
 -#define LIBAVUTIL_VERSION_MINOR 10
 -#define LIBAVUTIL_VERSION_MICRO  0
 +#define LIBAVUTIL_VERSION_MAJOR  52
- #define LIBAVUTIL_VERSION_MINOR  73
++#define LIBAVUTIL_VERSION_MINOR  74
 +#define LIBAVUTIL_VERSION_MICRO 100
  
  #define LIBAVUTIL_VERSION_INT   AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \
                                                 LIBAVUTIL_VERSION_MINOR, \