[ffmpeg] Removed unused code path

[casparcg] / modules / ffmpeg / producer / muxer / frame_muxer.cpp

diff --git a/modules/ffmpeg/producer/muxer/frame_muxer.cpp b/modules/ffmpeg/producer/muxer/frame_muxer.cpp
index bf4850ddc8bbfdf98da2b1b228ba0375ba7e75a7..80a11b70f91f2ee6d38dd44c47d18db2d8320c20 100644 (file)
--- a/modules/ffmpeg/producer/muxer/frame_muxer.cpp
+++ b/modules/ffmpeg/producer/muxer/frame_muxer.cpp
@@ -206,7 +206,7 @@ struct frame_muxer::impl : boost::noncopyable
                }
 
                if (audio_streams_.back().size() > 32 * audio_cadence_.front() * audio_channel_layout_.num_channels)
-                       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."));
+                       CASPAR_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."));
        }
 
        bool video_ready() const
@@ -255,7 +255,7 @@ struct frame_muxer::impl : boost::noncopyable
 
                frame_buffer_.push(core::draw_frame(std::move(frame)));
 
-               return frame_buffer_.empty() ? core::draw_frame::empty() : poll();
+               return poll();
        }
 
        core::mutable_frame pop_video()
@@ -304,8 +304,6 @@ private:
                display_mode_ = display_mode::simple;
 
                auto mode = get_mode(*frame);
-               if (mode == core::field_mode::progressive && frame->height < 720 && in_framerate_ < 50) // SD frames are interlaced. Probably incorrect meta-data. Fix it.
-                       mode = core::field_mode::upper;
 
                if (filter::is_deinterlacing(filter_str_))
                {