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 /libavfilter | |
| 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 'libavfilter')
| -rw-r--r-- | libavfilter/af_pan.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/libavfilter/af_pan.c b/libavfilter/af_pan.c index 49f8677b90..d8c4116a07 100644 --- a/libavfilter/af_pan.c +++ b/libavfilter/af_pan.c @@ -213,12 +213,18 @@ static int query_formats(AVFilterContext *ctx) PanContext *pan = ctx->priv; AVFilterLink *inlink = ctx->inputs[0]; AVFilterLink *outlink = ctx->outputs[0]; + AVFilterFormats *formats = NULL; AVFilterChannelLayouts *layouts; pan->pure_gains = are_gains_pure(pan); /* libswr supports any sample and packing formats */ avfilter_set_common_sample_formats(ctx, avfilter_make_all_formats(AVMEDIA_TYPE_AUDIO)); + formats = ff_all_samplerates(); + if (!formats) + return AVERROR(ENOMEM); + ff_set_common_samplerates(ctx, formats); + // inlink supports any channel layout layouts = ff_all_channel_layouts(); ff_channel_layouts_ref(layouts, &inlink->out_channel_layouts); |