]> git.sesse.net Git - casparcg/commitdiff
git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches...
authorronag <ronag@362d55ac-95cf-4e76-9f9a-cbaa9c17b72d>
Sun, 18 Mar 2012 02:02:20 +0000 (02:02 +0000)
committerronag <ronag@362d55ac-95cf-4e76-9f9a-cbaa9c17b72d>
Sun, 18 Mar 2012 02:02:20 +0000 (02:02 +0000)
modules/ffmpeg/producer/muxer/frame_muxer.cpp

index 44ee99f73f8cf62b49954cce983a9a3ad84e8b19..48bc3b479a28cd19a2836b18d8ab07597a4ce419 100644 (file)
@@ -304,19 +304,9 @@ struct frame_muxer::impl : boost::noncopyable
                        CASPAR_LOG(warning) << L"[frame_muxer] Auto-transcode: Failed to detect display-mode.";\r
                        display_mode_ = display_mode::simple;\r
                }\r
-                       \r
-               if(!boost::iequals(filter_.filter_str(), filter_str))\r
-               {\r
-                       for(int n = 0; n < filter_.delay(); ++n)\r
-                       {\r
-                               filter_.push(frame);\r
-                               auto av_frame = filter_.poll();\r
-                               if(av_frame)                                                    \r
-                                       video_streams_.back().push(make_frame(this, spl::make_shared_ptr(av_frame), format_desc_.fps, *frame_factory_));\r
-                       }\r
-                       filter_ = filter(filter_str);\r
-                       CASPAR_LOG(info) << L"[frame_muxer] " << display_mode_ << L" " << print_mode(frame->width, frame->height, in_fps_, frame->interlaced_frame > 0);\r
-               }\r
+\r
+               filter_ = filter(filter_str);\r
+               CASPAR_LOG(info) << L"[frame_muxer] " << display_mode_ << L" " << print_mode(frame->width, frame->height, in_fps_, frame->interlaced_frame > 0);\r
        }\r
        \r
        uint32_t calc_nb_frames(uint32_t nb_frames) const\r