git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches...

diff --git a/modules/ffmpeg/producer/ffmpeg_producer.cpp b/modules/ffmpeg/producer/ffmpeg_producer.cpp
index 274e43134c6094a4883f6139944b47c6ca374927..2cf11bcff74956538cac85c7ac074f40a9780048 100644 (file)
--- a/modules/ffmpeg/producer/ffmpeg_producer.cpp
+++ b/modules/ffmpeg/producer/ffmpeg_producer.cpp
@@ -127,8 +127,6 @@ public:
                graph_->set_color("underflow", diagnostics::color(0.6f, 0.3f, 0.9f));   \r
                graph_->set_text(print());\r
                diagnostics::register_graph(graph_);\r
-\r
-               input_.start();\r
        }\r
 \r
        ~ffmpeg_producer()\r

diff --git a/modules/ffmpeg/producer/input/input.cpp b/modules/ffmpeg/producer/input/input.cpp
index c886bb8ef20b72a9c28378445e84e61e29be7089..78793ce61197a834b7681dd93e43166e332ad74c 100644 (file)
--- a/modules/ffmpeg/producer/input/input.cpp
+++ b/modules/ffmpeg/producer/input/input.cpp
@@ -119,6 +119,7 @@ public:
                graph_->set_color("buffer-size", diagnostics::color(1.0f, 1.0f, 0.0f)); \r
                                \r
                is_running_ = true;\r
+               agent::start();\r
        }\r
 \r
        ~implementation()\r
@@ -126,7 +127,7 @@ public:
                if(is_running_)\r
                        stop();\r
        }\r
-       \r
+               \r
        void stop()\r
        {\r
                is_running_ = false;\r
@@ -295,11 +296,6 @@ size_t input::nb_loops() const
        return impl_->nb_loops_;\r
 }\r
 \r
-void input::start()\r
-{\r
-       impl_->start();\r
-}\r
-\r
 void input::stop()\r
 {\r
        impl_->stop();\r

diff --git a/modules/ffmpeg/producer/input/input.h b/modules/ffmpeg/producer/input/input.h
index 5eeb5ad9ed947e5fecc56f8210903d0491a2a1f8..e14ec91a641dbe825737f54e0a322b37ac12d1b6 100644 (file)
--- a/modules/ffmpeg/producer/input/input.h
+++ b/modules/ffmpeg/producer/input/input.h
@@ -68,7 +68,6 @@ public:
        bool loop() const;\r
        void loop(bool value);\r
 \r
-       void start();\r
        void stop();\r
 private:\r
        friend struct implemenation;\r

diff --git a/modules/ffmpeg/producer/muxer/frame_muxer.cpp b/modules/ffmpeg/producer/muxer/frame_muxer.cpp
index 56bc3971d2ccf7735dc6de489efc4d34802cfc81..2774621654ea57dba77b1ea7326185fe69f98996 100644 (file)
--- a/modules/ffmpeg/producer/muxer/frame_muxer.cpp
+++ b/modules/ffmpeg/producer/muxer/frame_muxer.cpp
@@ -210,7 +210,7 @@ struct frame_muxer2::implementation : public Concurrency::agent, boost::noncopya
                case display_mode::half:                                                \r
                        {                                                               \r
                                send(target_, frame_muxer2::target_element_t(video, ticket));\r
-                               auto video2 = receive_video();\r
+                               auto video2 = receive_video(); // throw away\r
                                \r
                                return video2 != nullptr;\r
                        }\r