Merge branch 'master' into content-rework-take5

[dcpomatic.git] / src / lib / ffmpeg_decoder.cc

diff --git a/src/lib/ffmpeg_decoder.cc b/src/lib/ffmpeg_decoder.cc
index d0b1de748c0e2960dc4bc3ed9aeade1c8db2ab00..eac1d91aea3c93db48178ed6fd7775e9b830c7af 100644 (file)
--- a/src/lib/ffmpeg_decoder.cc
+++ b/src/lib/ffmpeg_decoder.cc
@@ -143,7 +143,7 @@ FFmpegDecoder::setup_general ()
                        }
                        
                        _audio_streams.push_back (
-                               FFmpegAudioStream (stream_name (s), i, s->codec->sample_rate, s->codec->channel_layout)
+                               FFmpegAudioStream (stream_name (s), i, s->codec->sample_rate, s->codec->channels)
                                );
                        
                } else if (s->codec->codec_type == AVMEDIA_TYPE_SUBTITLE) {