[ffmpeg] Reimplemented support for playing all audio streams in a clip and treating...

[casparcg] / modules / ffmpeg / producer / util / util.h

diff --git a/modules/ffmpeg/producer/util/util.h b/modules/ffmpeg/producer/util/util.h
index be76ca5dc81e393b130c421ab6d7b270bb9e9d55..4c1f45c06c51d294562a89ed3ef4409b55eab79d 100644 (file)
--- a/modules/ffmpeg/producer/util/util.h
+++ b/modules/ffmpeg/producer/util/util.h
@@ -56,12 +56,6 @@ struct AVCodecContext;
 
 namespace caspar { namespace ffmpeg {
 
-enum class FFMPEG_Resource {
-       FFMPEG_FILE,
-       FFMPEG_DEVICE,
-       FFMPEG_STREAM
-};
-
 typedef std::vector<std::pair<std::string, std::string>> ffmpeg_options;
 
 // Utils
@@ -99,7 +93,7 @@ bool try_get_duration(const std::wstring filename, std::int64_t& duration, boost
 core::audio_channel_layout get_audio_channel_layout(int num_channels, std::uint64_t layout, const std::wstring& channel_layout_spec);
 
 // av_get_default_channel_layout does not work for layouts not predefined in ffmpeg. This is needed to support > 8 channels.
-std::int64_t create_channel_layout_bitmask(int num_channels);
+std::uint64_t create_channel_layout_bitmask(int num_channels);
 
 std::vector<int> find_audio_cadence(const boost::rational<int>& framerate);