-
Michael Niedermayer authored
* commit '06c3cd3c': 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>
8de75f70
* commit '06c3cd3c': 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>