diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-05-17 16:51:59 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-05-17 16:55:01 +0200 |
| commit | dc2e051c4f1c03f952b86e6741b5cf22e78b86f8 (patch) | |
| tree | 763aefc9e4c4bbb970ac096c4641422d04258c84 /libswresample | |
| parent | b13d39bd812309aad7d912b3c55da8d16dd3efe8 (diff) | |
| parent | 5dbd66395acc4ea85a3dd311f93f988a1c6021e8 (diff) | |
| download | ffmpeg-dc2e051c4f1c03f952b86e6741b5cf22e78b86f8.tar.gz | |
Merge branch 'audio-filters' of https://github.com/ubitux/FFmpeg
* 'audio-filters' of https://github.com/ubitux/FFmpeg:
lavfi/pan: add supported sample rates to avoid a crash.
ffmpeg: do not warn when expecting EOF from lavfi.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswresample')
0 files changed, 0 insertions, 0 deletions