generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

swr: rename swr_alloc2() to swr_alloc_set_opts().

Browse Source
This commit is contained in:
Clément Bœsch
2011-11-16 19:43:58 +01:00
parent c4deb90cfa
commit 645c61fb2b
5 changed files with 23 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ffmpeg.c
View File

@@ -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);