From: Helge Norberg Date: Wed, 5 Oct 2016 16:56:53 +0000 (+0200) Subject: [ffmpeg] Removed unused code path X-Git-Tag: 2.1.0_Beta1~33 X-Git-Url: https://git.sesse.net/?p=casparcg;a=commitdiff_plain;h=536d93d974051e67bc306c462173fd02579b91d3 [ffmpeg] Removed unused code path --- diff --git a/modules/ffmpeg/producer/muxer/frame_muxer.cpp b/modules/ffmpeg/producer/muxer/frame_muxer.cpp index cbd243244..80a11b70f 100644 --- a/modules/ffmpeg/producer/muxer/frame_muxer.cpp +++ b/modules/ffmpeg/producer/muxer/frame_muxer.cpp @@ -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()