Merge commit '06c3cd3c0186803619bc6aad2d8f06c3e9015d15'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 24 Mar 2014 14:04:47 +0000 (15:04 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 24 Mar 2014 14:04:47 +0000 (15:04 +0100)
commit8de75f703adafced474ddf748c46d091ee0a8f4a
tree994e24bf92fa5c758a9b02e531aab8f947505d8f
parent3e1f24131ac018c8b4bcc852a02ccfadf20d1dbb
parent06c3cd3c0186803619bc6aad2d8f06c3e9015d15
Merge commit '06c3cd3c0186803619bc6aad2d8f06c3e9015d15'

* 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>
doc/filters.texi
libavfilter/af_volume.c
libavfilter/af_volume.h