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 447ff50caf4c23e972f0a9e1a00a337348eeb62c..aa984d7f275f244e6adcc0de13453eebbbd5c82a 100644 (file)
--- a/modules/ffmpeg/producer/muxer/frame_muxer.cpp
+++ b/modules/ffmpeg/producer/muxer/frame_muxer.cpp
@@ -289,6 +289,11 @@ struct frame_muxer::impl : boost::noncopyable
                {\r
                        display_mode_ = display_mode::deinterlace_bob_reinterlace; // The frame will most likely be scaled, we need to deinterlace->reinterlace \r
                }\r
+\r
+               // ALWAYS de-interlace, until we have GPU de-interlacing.\r
+               if(frame->interlaced_frame)\r
+                       display_mode_ = display_mode::deinterlace_bob_reinterlace;\r
+\r
                \r
                if(display_mode_ == display_mode::deinterlace)\r
                        filter_str = append_filter(filter_str, L"YADIF=0:-1");\r