Prefer direct in/out channel count values over channel layout, when
available. Fixes a pan filter bug (ticket #6790).
Signed-off-by: Tobias Rapp <t.r...@noa-archive.com>
---
libswresample/rematrix.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/libswresample/rematrix.c b/libswresample/rematrix.c
index 9fcfff1..8227730 100644
--- a/libswresample/rematrix.c
+++ b/libswresample/rematrix.c
@@ -69,8 +69,10 @@ int swr_set_matrix(struct SwrContext *s, const double
*matrix, int stride)
return AVERROR(EINVAL);
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_out = av_get_channel_layout_nb_channels(s->user_out_ch_layout);
+ nb_in = (s->user_in_ch_count > 0) ? s->user_in_ch_count :
+ av_get_channel_layout_nb_channels(s->user_in_ch_layout);
+ nb_out = (s->user_out_ch_count > 0) ? s->user_out_ch_count :
+ 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_flt[out][in] = s->matrix[out][in] = matrix[in];
--
2.7.4
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
