diff options
| author | Nicolas George <nicolas.george@normalesup.org> | 2013-02-26 20:11:47 +0100 |
|---|---|---|
| committer | Nicolas George <nicolas.george@normalesup.org> | 2013-02-28 19:23:12 +0100 |
| commit | 2bd104c72a108f4f6291f0d0165f2d43ca115a98 (patch) | |
| tree | bb977dff3c6892db26cbaf5ff7f1e029f58d1635 /libavfilter | |
| parent | 89f9f69e3fa50083fd9df9c0628885c88f36bf4a (diff) | |
| download | ffmpeg-2bd104c72a108f4f6291f0d0165f2d43ca115a98.tar.gz | |
lavfi/af_aresample: fix layout consistency check.
If the channel layout is unknown, lswr will internally use
the default one for the corresponding number of channels.
Diffstat (limited to 'libavfilter')
| -rw-r--r-- | libavfilter/af_aresample.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavfilter/af_aresample.c b/libavfilter/af_aresample.c index 2e3867efda..ab3e7cf9e8 100644 --- a/libavfilter/af_aresample.c +++ b/libavfilter/af_aresample.c @@ -160,7 +160,7 @@ static int config_output(AVFilterLink *outlink) outlink->time_base = (AVRational) {1, out_rate}; av_assert0(outlink->sample_rate == out_rate); - av_assert0(outlink->channel_layout == out_layout); + av_assert0(outlink->channel_layout == out_layout || !outlink->channel_layout); av_assert0(outlink->format == out_format); aresample->ratio = (double)outlink->sample_rate / inlink->sample_rate; |