aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorClément Bœsch <ubitux@gmail.com>2011-11-24 15:37:30 +0100
committerClément Bœsch <ubitux@gmail.com>2011-11-24 16:55:44 +0100
commitafb0470a2559c54ff41c9947f848ac7d58ac1003 (patch)
tree4c392326f0ee15ed1cb60787bd498ca978834743
parent2bf09826c170b0f474f1cd92a138acd8109eef8b (diff)
downloadffmpeg-afb0470a2559c54ff41c9947f848ac7d58ac1003.tar.gz
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.
-rw-r--r--libswresample/swresample.c1
1 files changed, 1 insertions, 0 deletions
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;
}