generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

lswr: fix assert failure on unknown layouts.

Browse Source 
(cherry picked from commit 4a640a6ac8)
This commit is contained in:
Nicolas George
2013-10-25 16:11:30 +02:00
committed by Carl Eugen Hoyos
parent 9a4acedf31
commit 02c8c064ea
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libswresample/rematrix.c
View File

@@ -424,8 +424,8 @@ int swri_rematrix(SwrContext *s, AudioData *out, AudioData *in, int len, int mus
off = len1 * out->bps; off = len1 * out->bps;
} }
av_assert0(out->ch_count == av_get_channel_layout_nb_channels(s->out_ch_layout)); av_assert0(!s->out_ch_layout || 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-> 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++){ for(out_i=0; out_i<out->ch_count; out_i++){
switch(s->matrix_ch[out_i][0]){ switch(s->matrix_ch[out_i][0]){