[FFmpeg-cvslog] swr: change minimum I/O channel count to zero.
Clément Bœsch
git at videolan.org
Sun Nov 20 16:06:07 CET 2011
ffmpeg | branch: master | Clément Bœsch <ubitux at gmail.com> | Sun Nov 20 15:25:01 2011 +0100| [bdd22e3523c1d04602df622bd388a0c04e9b9652] | committer: Clément Bœsch
swr: change minimum I/O channel count to zero.
This will silence the warning of av_set_opt_int() in swr for
input/output channels when the layout is not yet defined (or supported).
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=bdd22e3523c1d04602df622bd388a0c04e9b9652
---
libswresample/swresample.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/libswresample/swresample.c b/libswresample/swresample.c
index 83b446e..1efb563 100644
--- a/libswresample/swresample.c
+++ b/libswresample/swresample.c
@@ -36,8 +36,8 @@
//TODO split options array out?
#define OFFSET(x) offsetof(SwrContext,x)
static const AVOption options[]={
-{"ich", "input channel count", OFFSET( in.ch_count ), AV_OPT_TYPE_INT, {.dbl=2}, 1, SWR_CH_MAX, 0},
-{"och", "output channel count", OFFSET(out.ch_count ), AV_OPT_TYPE_INT, {.dbl=2}, 1, SWR_CH_MAX, 0},
+{"ich", "input channel count", OFFSET( in.ch_count ), AV_OPT_TYPE_INT, {.dbl=2}, 0, SWR_CH_MAX, 0},
+{"och", "output channel count", OFFSET(out.ch_count ), AV_OPT_TYPE_INT, {.dbl=2}, 0, SWR_CH_MAX, 0},
{"uch", "used channel count", OFFSET(used_ch_count ), AV_OPT_TYPE_INT, {.dbl=0}, 0, SWR_CH_MAX, 0},
{"isr", "input sample rate" , OFFSET( in_sample_rate), AV_OPT_TYPE_INT, {.dbl=48000}, 1, INT_MAX, 0},
{"osr", "output sample rate" , OFFSET(out_sample_rate), AV_OPT_TYPE_INT, {.dbl=48000}, 1, INT_MAX, 0},
More information about the ffmpeg-cvslog
mailing list