mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-01-24 13:56:33 +02:00
878f8b0d26
* commit 'aaab192df24a90f4450285cfb73b395cf495b462': af_volume: implement replaygain clipping prevention Conflicts: doc/filters.texi Merged-by: Michael Niedermayer <michaelni@gmx.at>