From afb0470a2559c54ff41c9947f848ac7d58ac1003 Mon Sep 17 00:00:00 2001 From: Clément Bœsch Date: Thu, 24 Nov 2011 15:37:30 +0100 Subject: swr: fix test program. The number of used channels need to be reset to zero when swr_alloc_set_opts() is called successive times. This is a regression introduced in c8136ebd. --- libswresample/swresample.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libswresample/swresample.c b/libswresample/swresample.c index 1efb563d8f..e4c1ff9ca2 100644 --- a/libswresample/swresample.c +++ b/libswresample/swresample.c @@ -105,6 +105,7 @@ struct SwrContext *swr_alloc_set_opts(struct SwrContext *s, av_opt_set_int(s, "tsf", AV_SAMPLE_FMT_S16, 0); av_opt_set_int(s, "ich", av_get_channel_layout_nb_channels(s-> in_ch_layout), 0); av_opt_set_int(s, "och", av_get_channel_layout_nb_channels(s->out_ch_layout), 0); + av_opt_set_int(s, "uch", 0, 0); return s; } -- cgit v1.2.3