diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-04-12 21:50:53 +0300 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-04-12 23:21:34 +0300 |
| commit | 80a28c7509a11114e1aea5b208d56c6646d69c07 (patch) | |
| tree | 3c1771c91c989bee9a47649376b9e6c96807b34d /libswresample/rematrix.c | |
| parent | d7b9cb2f7a51351586791e65fa22e6536ee58c9f (diff) | |
swresample: Allow reinitialization without ever setting channel layouts
Diffstat (limited to 'libswresample/rematrix.c')
| -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 f26ede79f2..4569558138 100644 --- a/libswresample/rematrix.c +++ b/libswresample/rematrix.c @@ -65,8 +65,8 @@ 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 return AVERROR(EINVAL); memset(s->matrix, 0, sizeof(s->matrix)); - nb_in = av_get_channel_layout_nb_channels(s->in_ch_layout); - nb_out = av_get_channel_layout_nb_channels(s->out_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); for (out = 0; out < nb_out; out++) { for (in = 0; in < nb_in; in++) s->matrix[out][in] = matrix[in]; |