diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-02-24 21:44:52 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-02-24 21:46:00 +0100 |
| commit | fc10ed2cac71d8bcda80afdb8f1a3112b854fbd5 (patch) | |
| tree | 145e2995812b5f70c17cc3aaa656be2416d3e211 /ffmpeg.h | |
| parent | 70a25587d22384bca8f102d68f5b65ebf3e421b2 (diff) | |
| parent | dcc7e4bf1d0913123bfafbc58bf47bd41dd5848d (diff) | |
| download | ffmpeg-fc10ed2cac71d8bcda80afdb8f1a3112b854fbd5.tar.gz | |
Merge commit 'dcc7e4bf1d0913123bfafbc58bf47bd41dd5848d'
* commit 'dcc7e4bf1d0913123bfafbc58bf47bd41dd5848d':
af_resample: preserve frame properties
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg.h')
0 files changed, 0 insertions, 0 deletions