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)
commitd35efda21a146ad437e194cf124e3ca170bfc82e
tree20fac70dd33de4d86979fc2c897c88ea27c0e0dc
parent11d187b377be54de23f609592ce0f32d51ed9e6d
parentae43c10e36197000de2f3cc99ea35727ce98a796
Merge commit 'ae43c10e36197000de2f3cc99ea35727ce98a796'

* commit 'ae43c10e36197000de2f3cc99ea35727ce98a796':
  replaygain: allow exporting already decoded replaygain values

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