highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

swresample/rematrix: Fix float part of swr_set_matrix()

Browse Source 
Fixes Ticket #5897.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Vodyannikov Aleksandr 2016-10-20 06:57:35 +03:00 committed by Michael Niedermayer
parent ded5c88528
commit 9445e7e6d5
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libswresample/rematrix.c
View File

@ -68,14 +68,12 @@ int swr_set_matrix(struct SwrContext *s, const double *matrix, int stride)
if (!s || s->in_convert) // s needs to be allocated but not initialized if (!s || s->in_convert) // s needs to be allocated but not initialized
return AVERROR(EINVAL); return AVERROR(EINVAL);
memset(s->matrix, 0, sizeof(s->matrix)); memset(s->matrix, 0, sizeof(s->matrix));
memset(s->matrix_flt, 0, sizeof(s->matrix_flt));
nb_in = av_get_channel_layout_nb_channels(s->user_in_ch_layout); nb_in = av_get_channel_layout_nb_channels(s->user_in_ch_layout);
nb_out = av_get_channel_layout_nb_channels(s->user_out_ch_layout); nb_out = av_get_channel_layout_nb_channels(s->user_out_ch_layout);
for (out = 0; out < nb_out; out++) { for (out = 0; out < nb_out; out++) {
for (in = 0; in < nb_in; in++) for (in = 0; in < nb_in; in++)
s->matrix[out][in] = matrix[in]; s->matrix_flt[out][in] = s->matrix[out][in] = matrix[in];
if (s->int_sample_fmt == AV_SAMPLE_FMT_FLTP)
for (in = 0; in < nb_in; in++)
s->matrix_flt[out][in] = matrix[in];
matrix += stride; matrix += stride;
} }
s->rematrix_custom = 1; s->rematrix_custom = 1;