* commit '06c3cd3c0186803619bc6aad2d8f06c3e9015d15': af_volume: support using replaygain frame side data Conflicts: doc/filters.texi libavfilter/af_volume.c libavfilter/af_volume.h Merged-by: Michael Niedermayer <michaelni@gmx.at>