diff options
| author | Clément Bœsch <ubitux@gmail.com> | 2011-11-17 11:36:14 +0100 |
|---|---|---|
| committer | Clément Bœsch <ubitux@gmail.com> | 2011-11-17 17:57:20 +0100 |
| commit | 1dbd433f0dce3440f8b7bf315c50e1420dd7ce89 (patch) | |
| tree | a5dd6d1ed892278a9fae0dc776887b03f05318b1 /libswresample/swresample.c | |
| parent | f03afd5d54f903a2571e979c664cc0f3e31ee98c (diff) | |
| download | ffmpeg-1dbd433f0dce3440f8b7bf315c50e1420dd7ce89.tar.gz | |
swr: use av_opt_set_int() instead of manual assignments in swr_alloc_set_opts().
Diffstat (limited to 'libswresample/swresample.c')
| -rw-r--r-- | libswresample/swresample.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/libswresample/swresample.c b/libswresample/swresample.c index 6c6482a19f..a8576d4b1b 100644 --- a/libswresample/swresample.c +++ b/libswresample/swresample.c @@ -98,12 +98,11 @@ struct SwrContext *swr_alloc_set_opts(struct SwrContext *s, av_opt_set_int(s, "icl", in_ch_layout, 0); av_opt_set_int(s, "isf", in_sample_fmt, 0); av_opt_set_int(s, "isr", in_sample_rate, 0); + 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); s->channel_map = channel_map; - 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; - return s; } |