Merge commit 'dcc7e4bf1d0913123bfafbc58bf47bd41dd5848d'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 24 Feb 2014 20:44:52 +0000 (21:44 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 24 Feb 2014 20:46:00 +0000 (21:46 +0100)
commitfc10ed2cac71d8bcda80afdb8f1a3112b854fbd5
tree145e2995812b5f70c17cc3aaa656be2416d3e211
parent70a25587d22384bca8f102d68f5b65ebf3e421b2
parentdcc7e4bf1d0913123bfafbc58bf47bd41dd5848d
Merge commit 'dcc7e4bf1d0913123bfafbc58bf47bd41dd5848d'

* commit 'dcc7e4bf1d0913123bfafbc58bf47bd41dd5848d':
  af_resample: preserve frame properties

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