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

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

diff --git a/modules/ffmpeg/producer/filter/filter.h b/modules/ffmpeg/producer/filter/filter.h
index 8dab6ea150baee8288aa983b9b048933157d717d..e8d62314168eb0eb2a814430cd6b68fab24770a2 100644 (file)
--- a/modules/ffmpeg/producer/filter/filter.h
+++ b/modules/ffmpeg/producer/filter/filter.h
@@ -30,8 +30,19 @@
 #include <string>
 #include <vector>
 
+#if defined(_MSC_VER)
+#pragma warning (push)
+#pragma warning (disable : 4244)
+#endif
+extern "C"
+{
+#include <libavutil/pixfmt.h>
+}
+#if defined(_MSC_VER)
+#pragma warning (pop)
+#endif
+
 struct AVFrame;
-enum AVPixelFormat;
 
 namespace caspar { namespace ffmpeg {
 
@@ -40,6 +51,11 @@ static std::wstring append_filter(const std::wstring& filters, const std::wstrin
        return filters + (filters.empty() ? L"" : L",") + filter;
 }
 
+static std::wstring prepend_filter(const std::wstring& filters, const std::wstring& filter)
+{
+       return filter + (filters.empty() ? L"" : L",") + filters;
+}
+
 class filter : boost::noncopyable
 {
 public:
@@ -78,16 +94,6 @@ public:
                        return true;    
                return false;
        }       
-       
-       static int delay(const std::wstring& filters)
-       {
-               return is_double_rate(filters) ? 1 : 1;
-       }
-
-       int delay() const
-       {
-               return delay(filter_str());
-       }
 
        bool is_double_rate() const
        {
@@ -103,4 +109,4 @@ private:
        spl::shared_ptr<implementation> impl_;
 };
 
-}}
\ No newline at end of file
+}}