[FFmpeg-cvslog] swr: fix test program.

Clément Bœsch git at videolan.org
Thu Nov 24 16:56:30 CET 2011


ffmpeg | branch: master | Clément Bœsch <ubitux at gmail.com> | Thu Nov 24 15:37:30 2011 +0100| [afb0470a2559c54ff41c9947f848ac7d58ac1003] | committer: Clément Bœsch

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.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=afb0470a2559c54ff41c9947f848ac7d58ac1003
---

 libswresample/swresample.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/libswresample/swresample.c b/libswresample/swresample.c
index 1efb563..e4c1ff9 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;
 }
 



More information about the ffmpeg-cvslog mailing list