Merge commit 'aaab192df24a90f4450285cfb73b395cf495b462'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 13 Apr 2014 12:39:51 +0000 (14:39 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 13 Apr 2014 12:39:51 +0000 (14:39 +0200)
commit878f8b0d26e9bd34f27949e8b7d2be6c864ca998
tree80dcab1fb6118211073a065d97ed5f9575fc4c50
parentc11aa9d29aaea7a9f6952d17707eb549fd32c65e
parentaaab192df24a90f4450285cfb73b395cf495b462
Merge commit 'aaab192df24a90f4450285cfb73b395cf495b462'

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

Conflicts:
doc/filters.texi

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