ffmpeg_producer: Multiple audio streams are now merged (flattened) before the audio...

[casparcg] / modules / ffmpeg / producer / audio / audio_decoder.h

diff --git a/modules/ffmpeg/producer/audio/audio_decoder.h b/modules/ffmpeg/producer/audio/audio_decoder.h
index a1ed375067d2977021eb288b6854232250e321db..99f6e398be358d3342bb7c44b94b1761b28314fd 100644 (file)
--- a/modules/ffmpeg/producer/audio/audio_decoder.h
+++ b/modules/ffmpeg/producer/audio/audio_decoder.h
@@ -38,7 +38,7 @@ namespace caspar { namespace ffmpeg {
 class audio_decoder : public boost::noncopyable
 {
 public:
-       explicit audio_decoder(class input& input, const core::video_format_desc& format_desc, const std::wstring& channel_layout_spec, int audio_stream_index = 0);
+       explicit audio_decoder(class input& input, const core::video_format_desc& format_desc, int audio_stream_index);
        
        audio_decoder(audio_decoder&& other);
        audio_decoder& operator=(audio_decoder&& other);
@@ -46,7 +46,6 @@ public:
        std::shared_ptr<AVFrame> operator()();
 
        uint32_t nb_frames() const;
-       const core::audio_channel_layout& channel_layout() const;
        
        std::wstring print() const;