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 aa984d7f275f244e6adcc0de13453eebbbd5c82a..44ee99f73f8cf62b49954cce983a9a3ad84e8b19 100644 (file)
--- a/modules/ffmpeg/producer/muxer/frame_muxer.cpp
+++ b/modules/ffmpeg/producer/muxer/frame_muxer.cpp
@@ -291,9 +291,8 @@ struct frame_muxer::impl : boost::noncopyable
                }\r
 \r
                // ALWAYS de-interlace, until we have GPU de-interlacing.\r
-               if(frame->interlaced_frame)\r
+               if(frame->interlaced_frame && display_mode_ != display_mode::deinterlace_bob && display_mode_ != display_mode::deinterlace)\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