Update most code to the new FFmpeg channel layout API.

[nageru] / futatabi / video_stream.cpp

diff --git a/futatabi/video_stream.cpp b/futatabi/video_stream.cpp
index a21832929957ea1d1ab84ade759dc524337666bf..2a0c7c02b2ecb3e0edc1f4bd839735aafb377ab3 100644 (file)
--- a/futatabi/video_stream.cpp
+++ b/futatabi/video_stream.cpp
@@ -353,8 +353,9 @@ void VideoStream::start()
 
        audio_codecpar->codec_type = AVMEDIA_TYPE_AUDIO;
        audio_codecpar->codec_id = AV_CODEC_ID_PCM_S32LE;
-       audio_codecpar->channel_layout = AV_CH_LAYOUT_STEREO;
-       audio_codecpar->channels = 2;
+       audio_codecpar->ch_layout.order = AV_CHANNEL_ORDER_NATIVE;
+       audio_codecpar->ch_layout.nb_channels = 2;
+       audio_codecpar->ch_layout.u.mask = AV_CH_LAYOUT_STEREO;
        audio_codecpar->sample_rate = OUTPUT_FREQUENCY;
 
        size_t width = global_flags.width, height = global_flags.height;  // Doesn't matter for MJPEG.