summaryrefslogtreecommitdiff
path: root/ffmpeg.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2011-11-11 03:57:46 +0100
committerMichael Niedermayer <michaelni@gmx.at>2011-11-11 03:57:46 +0100
commit7d3982bf42c281e79fd3a1a03055c3000b3b0988 (patch)
treecfe4f3df4318376c4c4aa0637b20b5976b1b9c09 /ffmpeg.c
parent9ef5d707e6c12ec5164e6612d547f845da9cbafc (diff)
ffmpeg: get rid of deprecated warnings due to AVOption useage.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg.c')
-rw-r--r--ffmpeg.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/ffmpeg.c b/ffmpeg.c
index d3e97a3fc9..8896b0ceee 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -896,14 +896,14 @@ need_realloc:
dec->channel_layout, dec->sample_fmt, dec->sample_rate,
ost->audio_channels_mapped ? ost->audio_channels_map : 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) {
- av_set_int(ost->swr, "icl", av_get_default_channel_layout(ost->audio_channels_mapped));
- av_set_int(ost->swr, "uch", ost->audio_channels_mapped);
+ av_opt_set_int(ost->swr, "icl", av_get_default_channel_layout(ost->audio_channels_mapped), 0);
+ av_opt_set_int(ost->swr, "uch", ost->audio_channels_mapped, 0);
}
- av_set_int(ost->swr, "ich", dec->channels);
- av_set_int(ost->swr, "och", enc->channels);
- if(audio_sync_method>1) av_set_int(ost->swr, "flags", SWR_FLAG_RESAMPLE);
+ av_opt_set_int(ost->swr, "ich", dec->channels, 0);
+ av_opt_set_int(ost->swr, "och", enc->channels, 0);
+ if(audio_sync_method>1) av_opt_set_int(ost->swr, "flags", SWR_FLAG_RESAMPLE, 0);
if(ost->swr && swr_init(ost->swr) < 0){
av_log(NULL, AV_LOG_FATAL, "swr_init() failed\n");
swr_free(&ost->swr);