]> git.sesse.net Git - casparcg/commitdiff
2.0.0.2: flash_producer: Small cleanup.
authorronag <ronag@362d55ac-95cf-4e76-9f9a-cbaa9c17b72d>
Tue, 17 May 2011 20:59:24 +0000 (20:59 +0000)
committerronag <ronag@362d55ac-95cf-4e76-9f9a-cbaa9c17b72d>
Tue, 17 May 2011 20:59:24 +0000 (20:59 +0000)
git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches/2.0.0.2@768 362d55ac-95cf-4e76-9f9a-cbaa9c17b72d

modules/flash/producer/flash_producer.cpp

index 5880daac13516380211e30000338a9d9269d6d07..7f36c9965a5dc06dceca9ff4ab9fa0b76dabdbad 100644 (file)
@@ -295,24 +295,22 @@ public:
                        try\r
                        {               \r
                                const auto& format_desc = frame_factory_->get_video_format_desc();\r
-                               auto frame = core::basic_frame::empty();\r
 \r
                                if(abs(context_->fps()/2.0 - format_desc.fps) < 0.01) // flash == 2 * format -> interlace\r
                                {\r
                                        auto frame1 = context_->render_frame(frame_buffer_.size() < frame_buffer_.capacity());\r
                                        auto frame2 = context_->render_frame(frame_buffer_.size() < frame_buffer_.capacity());\r
                                        frame_buffer_.push(core::basic_frame::interlace(frame1, frame2, format_desc.mode));\r
-                                       frame = frame2;\r
                                }\r
                                else if(abs(context_->fps()- format_desc.fps/2.0) < 0.01) // format == 2 * flash -> duplicate\r
                                {\r
-                                       frame = context_->render_frame(frame_buffer_.size() < frame_buffer_.capacity());\r
+                                       auto frame = context_->render_frame(frame_buffer_.size() < frame_buffer_.capacity());\r
                                        frame_buffer_.push(frame);\r
                                        frame_buffer_.push(frame);\r
                                }\r
                                else //if(abs(renderer_->fps() - format_desc_.fps) < 0.1) // format == flash -> simple\r
                                {\r
-                                       frame = context_->render_frame(frame_buffer_.size() < frame_buffer_.capacity());\r
+                                       auto frame = context_->render_frame(frame_buffer_.size() < frame_buffer_.capacity());\r
                                        frame_buffer_.push(frame);\r
                                }\r
 \r