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

diff --git a/modules/ffmpeg/producer/muxer/frame_muxer.cpp b/modules/ffmpeg/producer/muxer/frame_muxer.cpp
index 959838801ce8a74b98a1422a8cd59cbb33ff33e7..463ced26b4a060818e34ddb602c7b591d3bc3aec 100644 (file)
--- a/modules/ffmpeg/producer/muxer/frame_muxer.cpp
+++ b/modules/ffmpeg/producer/muxer/frame_muxer.cpp
@@ -107,7 +107,7 @@ struct frame_muxer::impl : boost::noncopyable
                        video_stream_.push(std::move(empty_frame));\r
                        display_mode_ = display_mode::simple;\r
                }\r
-               else if(video)\r
+               else\r
                {\r
                        if(display_mode_ == display_mode::invalid)\r
                                update_display_mode(video);\r
@@ -129,7 +129,7 @@ struct frame_muxer::impl : boost::noncopyable
                {\r
                        boost::range::push_back(audio_stream_, core::audio_buffer(audio_cadence_.front(), 0));  \r
                }\r
-               else if(audio)  \r
+               else\r
                {\r
                        auto ptr = reinterpret_cast<int32_t*>(audio->data[0]);\r
                        audio_stream_.insert(audio_stream_.end(), ptr, ptr + audio->linesize[0]/sizeof(int32_t));\r