[FFmpeg-cvslog] Merge commit 'a49aa440c939e221194f8d95bf98673f8cf38a06'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Apr  5 00:16:53 2014 +0200| [37af48717067a2080d7f8cf186011251b17c9529] | committer: Michael Niedermayer

Merge commit 'a49aa440c939e221194f8d95bf98673f8cf38a06'

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

Conflicts:
	doc/filters.texi

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=37af48717067a2080d7f8cf186011251b17c9529
---