2.1.0: Cosmetics.

git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches/2.1.0@2589 362d55ac-95cf-4e76-9f9a-cbaa9c17b72d

diff --git a/modules/ffmpeg/producer/muxer/frame_muxer.cpp b/modules/ffmpeg/producer/muxer/frame_muxer.cpp
index 639e3976fc98e4cee7fcdac7ac102edee04ec163..108b052f0137a2f92450ad51283f4c4f2680c6a3 100644 (file)
--- a/modules/ffmpeg/producer/muxer/frame_muxer.cpp
+++ b/modules/ffmpeg/producer/muxer/frame_muxer.cpp
@@ -102,10 +102,8 @@ struct frame_muxer::impl : boost::noncopyable
                if(!video_frame)\r
                        return;\r
                \r
-               if(video_frame == flush_video())\r
-               {       \r
-                       video_streams_.push(std::queue<core::mutable_frame>());\r
-               }\r
+               if(video_frame == flush_video())                \r
+                       video_streams_.push(std::queue<core::mutable_frame>());         \r
                else if(video_frame == empty_video())\r
                {\r
                        auto empty_frame = frame_factory_->create_frame(this, core::pixel_format_desc(core::pixel_format::invalid));\r
@@ -131,18 +129,12 @@ struct frame_muxer::impl : boost::noncopyable
                if(!audio)      \r
                        return;\r
 \r
-               if(audio == flush_audio())\r
-               {\r
-                       audio_streams_.push(core::audio_buffer());\r
-               }\r
-               else if(audio == empty_audio())\r
-               {\r
-                       boost::range::push_back(audio_streams_.back(), core::audio_buffer(audio_cadence_.front(), 0));\r
-               }\r
-               else\r
-               {\r
-                       boost::range::push_back(audio_streams_.back(), *audio);\r
-               }\r
+               if(audio == flush_audio())              \r
+                       audio_streams_.push(core::audio_buffer());              \r
+               else if(audio == empty_audio())         \r
+                       boost::range::push_back(audio_streams_.back(), core::audio_buffer(audio_cadence_.front(), 0));          \r
+               else            \r
+                       boost::range::push_back(audio_streams_.back(), *audio);         \r
 \r
                if(audio_streams_.back().size() > static_cast<size_t>(32*audio_cadence_.front()))\r
                        BOOST_THROW_EXCEPTION(invalid_operation() << source_info("frame_muxer") << msg_info("audio-stream overflow. This can be caused by incorrect frame-rate. Check clip meta-data."));\r