X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=nageru%2Faudio_encoder.cpp;h=4d42b4033c2a01052e41359005a897066c2fd426;hb=5a2fc1d6f27045ee559793414ea7e7578f427c6a;hp=61ddfffcb80fc38cd69d6e1031686addde49dd8a;hpb=2855093ec775a0500578d05c252cf6eedc005970;p=nageru

diff --git a/nageru/audio_encoder.cpp b/nageru/audio_encoder.cpp
index 61ddfff..4d42b40 100644
--- a/nageru/audio_encoder.cpp
+++ b/nageru/audio_encoder.cpp
@@ -39,8 +39,9 @@ AudioEncoder::AudioEncoder(const string &codec_name, int bit_rate, const AVOutpu
 	ctx->bit_rate = bit_rate;
 	ctx->sample_rate = OUTPUT_FREQUENCY;
 	ctx->sample_fmt = codec->sample_fmts[0];
-	ctx->channels = 2;
-	ctx->channel_layout = AV_CH_LAYOUT_STEREO;
+	ctx->ch_layout.order = AV_CHANNEL_ORDER_NATIVE;
+	ctx->ch_layout.nb_channels = 2;
+	ctx->ch_layout.u.mask = AV_CH_LAYOUT_STEREO;
 	ctx->time_base = AVRational{1, TIMEBASE};
 	if (oformat->flags & AVFMT_GLOBALHEADER) {
 		ctx->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;
@@ -110,8 +111,9 @@ void AudioEncoder::encode_audio_one_frame(const float *audio, size_t num_samples
 {
 	audio_frame->pts = audio_pts;
 	audio_frame->nb_samples = num_samples;
-	audio_frame->channels = 2;
-	audio_frame->channel_layout = AV_CH_LAYOUT_STEREO;
+	audio_frame->ch_layout.order = AV_CHANNEL_ORDER_NATIVE;
+	audio_frame->ch_layout.nb_channels = 2;
+	audio_frame->ch_layout.u.mask = AV_CH_LAYOUT_STEREO;
 	audio_frame->format = ctx->sample_fmt;
 	audio_frame->sample_rate = OUTPUT_FREQUENCY;