Merge commit 'a49aa440c939e221194f8d95bf98673f8cf38a06'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 4 Apr 2014 22:16:53 +0000 (00:16 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 4 Apr 2014 22:16:53 +0000 (00:16 +0200)
commit37af48717067a2080d7f8cf186011251b17c9529
treeeade62871f28b809cd165f543ac6c65877becf72
parent490d53e335dc5954d1308172af374e9bf9d031eb
parenta49aa440c939e221194f8d95bf98673f8cf38a06
Merge commit 'a49aa440c939e221194f8d95bf98673f8cf38a06'

* commit 'a49aa440c939e221194f8d95bf98673f8cf38a06':
  af_volume: implement replaygain pre-amplification

Conflicts:
doc/filters.texi

Merged-by: Michael Niedermayer <michaelni@gmx.at>
doc/filters.texi
libavfilter/af_volume.c
libavfilter/af_volume.h