Merge commit 'ae43c10e36197000de2f3cc99ea35727ce98a796'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 17 Apr 2014 19:45:39 +0000 (21:45 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 17 Apr 2014 19:45:58 +0000 (21:45 +0200)
* commit 'ae43c10e36197000de2f3cc99ea35727ce98a796':
  replaygain: allow exporting already decoded replaygain values

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

Simple merge
Simple merge