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:05:20 +0100 |
| commit | cfcb22a77bd4605c4e1d343b7e8dfe4c356134da (patch) | |
| tree | 3108168cceaf1be5e094a747283e50c1d518bfef | |
| parent | 838a453e39624a76071f551c070c707ab7d5600b (diff) | |
| download | ffmpeg-cfcb22a77bd4605c4e1d343b7e8dfe4c356134da.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 5c98e68990..e146edfcf7 100644 --- a/libswresample/rematrix.c +++ b/libswresample/rematrix.c @@ -433,8 +433,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]){ |