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

[casparcg] / common / scope_exit.h

diff --git a/common/scope_exit.h b/common/scope_exit.h
index 7509660712206c7eea87f02ed2e54c18ebd0e5b2..f433f1e1fff26a3cef5b43f699f3e4068cfdfe2f 100644 (file)
--- a/common/scope_exit.h
+++ b/common/scope_exit.h
@@ -23,7 +23,7 @@ namespace detail
                }
                
                scope_exit(scope_exit&& other)
-                       : func_(std::move(other.v))
+                       : func_(std::move(other.func_))
                        , valid_(std::move(other.valid_))
                {
                        other.valid_ = false;
@@ -49,7 +49,10 @@ namespace detail
                        catch(...)
                        {
                                if(!std::uncaught_exception()) 
+#pragma warning(push)
+#pragma warning(disable: 4297)
                                        throw;
+#pragma warning(pop)
                                else
                                        CASPAR_LOG_CURRENT_EXCEPTION();
                        }