diff options
| author | Clément Bœsch <ubitux@gmail.com> | 2011-11-14 21:33:42 +0100 |
|---|---|---|
| committer | Clément Bœsch <ubitux@gmail.com> | 2011-11-14 22:11:28 +0100 |
| commit | c8136ebd6a64b2404f5b871b944133049422535a (patch) | |
| tree | 3ea24c64bceb0222b862c9d502a8c5c059b491df /libswresample | |
| parent | 40176fc3149bc72c1309f93989a57aec2322e626 (diff) | |
| download | ffmpeg-c8136ebd6a64b2404f5b871b944133049422535a.tar.gz | |
swr: set the default used_ch_count value to zero.
This allows an appropriate behaviour when it is not specified (fallback
to the number of input channels).
Fixes Ticket523
Diffstat (limited to 'libswresample')
| -rw-r--r-- | libswresample/swresample.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libswresample/swresample.c b/libswresample/swresample.c index e814cd2fa0..aad48d676b 100644 --- a/libswresample/swresample.c +++ b/libswresample/swresample.c @@ -38,7 +38,7 @@ 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}, -{"uch", "used channel count", OFFSET(used_ch_count ), AV_OPT_TYPE_INT, {.dbl=2}, 1, 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}, //{"ip" , "input planar" , OFFSET( in.planar ), AV_OPT_TYPE_INT, {.dbl=0}, 0, 1, 0}, @@ -95,7 +95,6 @@ SwrContext *swr_alloc2(struct SwrContext *s, int64_t out_ch_layout, enum AVSampl s-> in.ch_count= av_get_channel_layout_nb_channels(s-> in_ch_layout); s->out.ch_count= av_get_channel_layout_nb_channels(s->out_ch_layout); s->int_sample_fmt = AV_SAMPLE_FMT_S16; - s->used_ch_count= s-> in.ch_count; return s; } |