Merge commit '39c2880eeae6930b1036ce1f479afc1e1152c13f'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 24 Feb 2014 21:13:42 +0000 (22:13 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 24 Feb 2014 21:13:42 +0000 (22:13 +0100)
commit6b06f9f1bc4c51a96186021bf0f99599e49aff47
tree4ad4bfbdca41249f208238a065b33950213f6b10
parentfc10ed2cac71d8bcda80afdb8f1a3112b854fbd5
parent39c2880eeae6930b1036ce1f479afc1e1152c13f
Merge commit '39c2880eeae6930b1036ce1f479afc1e1152c13f'

* commit '39c2880eeae6930b1036ce1f479afc1e1152c13f':
  af_volume: preserve frame properties

Conflicts:
libavfilter/af_volume.c

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