virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

avcodec/opusdec: stop setting deprecated swr options

Browse Source 
Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer
2022-09-23 16:43:00 -03:00
parent aa79d13f51
commit 1b47190c94
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
libavcodec/opusdec.c
View File

@@ -640,7 +640,7 @@ static av_cold int opus_decode_init(AVCodecContext *avctx)
for (i = 0; i < c->nb_streams; i++) { for (i = 0; i < c->nb_streams; i++) {
OpusStreamContext *s = &c->streams[i]; OpusStreamContext *s = &c->streams[i];
uint64_t layout; AVChannelLayout layout;
s->output_channels = (i < c->nb_stereo_streams) ? 2 : 1; s->output_channels = (i < c->nb_stereo_streams) ? 2 : 1;
@@ -658,11 +658,12 @@ static av_cold int opus_decode_init(AVCodecContext *avctx)
if (!s->swr) if (!s->swr)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
layout = (s->output_channels == 1) ? AV_CH_LAYOUT_MONO : AV_CH_LAYOUT_STEREO; layout = (s->output_channels == 1) ? (AVChannelLayout)AV_CHANNEL_LAYOUT_MONO :
(AVChannelLayout)AV_CHANNEL_LAYOUT_STEREO;
av_opt_set_int(s->swr, "in_sample_fmt", avctx->sample_fmt, 0); av_opt_set_int(s->swr, "in_sample_fmt", avctx->sample_fmt, 0);
av_opt_set_int(s->swr, "out_sample_fmt", avctx->sample_fmt, 0); av_opt_set_int(s->swr, "out_sample_fmt", avctx->sample_fmt, 0);
av_opt_set_int(s->swr, "in_channel_layout", layout, 0); av_opt_set_chlayout(s->swr, "in_chlayout", &layout, 0);
av_opt_set_int(s->swr, "out_channel_layout", layout, 0); av_opt_set_chlayout(s->swr, "out_chlayout", &layout, 0);
av_opt_set_int(s->swr, "out_sample_rate", avctx->sample_rate, 0); av_opt_set_int(s->swr, "out_sample_rate", avctx->sample_rate, 0);
av_opt_set_int(s->swr, "filter_size", 16, 0); av_opt_set_int(s->swr, "filter_size", 16, 0);