diff options
| author | Nicolas George <george@nsup.org> | 2013-10-25 16:11:30 +0200 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2013-11-28 01:09:06 +0100 |
| commit | 02c8c064ea285c39dede64ad5cbad0dc5ad66c6d (patch) | |
| tree | 14ff2fa665e4719c63577f4cbc497f60ea06e5a2 | |
| parent | 9a4acedf3177d2fa6c521d60022d4dcc2110411a (diff) | |
| download | ffmpeg-02c8c064ea285c39dede64ad5cbad0dc5ad66c6d.tar.gz | |
lswr: fix assert failure on unknown layouts.
(cherry picked from commit 4a640a6ac89099bfb02d6d3d3ada04e321a37476)
| -rw-r--r-- | libswresample/rematrix.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libswresample/rematrix.c b/libswresample/rematrix.c index 2ebe39772e..44ad792787 100644 --- a/libswresample/rematrix.c +++ b/libswresample/rematrix.c @@ -424,8 +424,8 @@ int swri_rematrix(SwrContext *s, AudioData *out, AudioData *in, int len, int mus off = len1 * out->bps; } - av_assert0(out->ch_count == av_get_channel_layout_nb_channels(s->out_ch_layout)); - av_assert0(in ->ch_count == av_get_channel_layout_nb_channels(s-> in_ch_layout)); + av_assert0(!s->out_ch_layout || out->ch_count == av_get_channel_layout_nb_channels(s->out_ch_layout)); + av_assert0(!s-> in_ch_layout || in ->ch_count == av_get_channel_layout_nb_channels(s-> in_ch_layout)); for(out_i=0; out_i<out->ch_count; out_i++){ switch(s->matrix_ch[out_i][0]){ |