[FFmpeg-cvslog] Merge commit 'aaab192df24a90f4450285cfb73b395cf495b462'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Apr 13 14:39:51 2014 +0200| [878f8b0d26e9bd34f27949e8b7d2be6c864ca998] | committer: Michael Niedermayer

Merge commit 'aaab192df24a90f4450285cfb73b395cf495b462'

* commit 'aaab192df24a90f4450285cfb73b395cf495b462':
  af_volume: implement replaygain clipping prevention

Conflicts:
	doc/filters.texi

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

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