diff options
author | Clément Bœsch <ubitux@gmail.com> | 2011-11-16 19:43:58 +0100 |
---|---|---|
committer | Clément Bœsch <ubitux@gmail.com> | 2011-11-17 10:16:07 +0100 |
commit | 645c61fb2b9e434768a59f3c52f093d726061d95 (patch) | |
tree | 20e6442056ba28ef1c28df578373db302a1f8150 /ffmpeg.c | |
parent | c4deb90cfaf7ef64bb80216ca1aa95db95a6f521 (diff) | |
download | ffmpeg-645c61fb2b9e434768a59f3c52f093d726061d95.tar.gz |
swr: rename swr_alloc2() to swr_alloc_set_opts().
Diffstat (limited to 'ffmpeg.c')
-rw-r--r-- | ffmpeg.c | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -891,11 +891,11 @@ need_realloc: //ost->swr = NULL; ost->audio_resample = 0; } else { - ost->swr = swr_alloc2(ost->swr, - enc->channel_layout, enc->sample_fmt, enc->sample_rate, - dec->channel_layout, dec->sample_fmt, dec->sample_rate, - ost->audio_channels_mapped ? ost->audio_channels_map : NULL, - 0, NULL); + ost->swr = swr_alloc_set_opts(ost->swr, + enc->channel_layout, enc->sample_fmt, enc->sample_rate, + dec->channel_layout, dec->sample_fmt, dec->sample_rate, + ost->audio_channels_mapped ? ost->audio_channels_map : NULL, + 0, NULL); av_opt_set_double(ost->swr, "rmvol", ost->rematrix_volume, 0); if (ost->audio_channels_mapped) { av_opt_set_int(ost->swr, "icl", av_get_default_channel_layout(ost->audio_channels_mapped), 0); |