virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

ffmpeg: get rid of deprecated warnings due to AVOption useage.

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2011-11-11 03:57:46 +01:00
parent 9ef5d707e6
commit 7d3982bf42
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ffmpeg.c
View File

@@ -896,14 +896,14 @@ need_realloc:
dec->channel_layout, dec->sample_fmt, dec->sample_rate, dec->channel_layout, dec->sample_fmt, dec->sample_rate,
ost->audio_channels_mapped ? ost->audio_channels_map : NULL, ost->audio_channels_mapped ? ost->audio_channels_map : NULL,
0, NULL); 0, NULL);
av_set_double(ost->swr, "rmvol", ost->rematrix_volume); av_opt_set_double(ost->swr, "rmvol", ost->rematrix_volume, 0);
if (ost->audio_channels_mapped) { if (ost->audio_channels_mapped) {
av_set_int(ost->swr, "icl", av_get_default_channel_layout(ost->audio_channels_mapped)); av_opt_set_int(ost->swr, "icl", av_get_default_channel_layout(ost->audio_channels_mapped), 0);
av_set_int(ost->swr, "uch", ost->audio_channels_mapped); av_opt_set_int(ost->swr, "uch", ost->audio_channels_mapped, 0);
} }
av_set_int(ost->swr, "ich", dec->channels); av_opt_set_int(ost->swr, "ich", dec->channels, 0);
av_set_int(ost->swr, "och", enc->channels); av_opt_set_int(ost->swr, "och", enc->channels, 0);
if(audio_sync_method>1) av_set_int(ost->swr, "flags", SWR_FLAG_RESAMPLE); if(audio_sync_method>1) av_opt_set_int(ost->swr, "flags", SWR_FLAG_RESAMPLE, 0);
if(ost->swr && swr_init(ost->swr) < 0){ if(ost->swr && swr_init(ost->swr) < 0){
av_log(NULL, AV_LOG_FATAL, "swr_init() failed\n"); av_log(NULL, AV_LOG_FATAL, "swr_init() failed\n");
swr_free(&ost->swr); swr_free(&ost->swr);