[ffmpeg_producer] Don't assume interlaced material based on resolution.

[casparcg] / common / base64.cpp

diff --git a/common/base64.cpp b/common/base64.cpp
index 8af634f7b1ed1e994cdcec41676e8b095293e5bb..3b4f1d11fd18fed87e136d74fd84f619eeb10c97 100644 (file)
--- a/common/base64.cpp
+++ b/common/base64.cpp
@@ -25,6 +25,7 @@
 
 #include <vector>
 #include <algorithm>
+#include <cstring>
 
 #include <boost/archive/iterators/insert_linebreaks.hpp>
 #include <boost/archive/iterators/base64_from_binary.hpp>
@@ -84,7 +85,7 @@ std::vector<unsigned char> from_base64(const std::string& data)
                        [] (char c) { return !std::isspace(static_cast<unsigned char>(c)); });
 
        if (length % 4 != 0)
-               BOOST_THROW_EXCEPTION(caspar_exception() << msg_info(
+               CASPAR_THROW_EXCEPTION(user_error() << msg_info(
                                "The length of a base64 sequence must be a multiple of 4"));
 
        int padding = 0;
@@ -143,4 +144,4 @@ std::vector<unsigned char> from_base64(const std::string& data)
        }
 }
 
-}
\ No newline at end of file
+}