2.1.0: -frame_muxer: Always assume SD as interlaced.

git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches/2.1.0@2587 362d55ac-95cf-4e76-9f9a-cbaa9c17b72d

diff --git a/modules/ffmpeg/producer/muxer/frame_muxer.cpp b/modules/ffmpeg/producer/muxer/frame_muxer.cpp
index c593681dbee957620e7fecca099412c9d7c6b59a..17e8a2c2b92a6940cc6d1b03ef1e34cfc2fabbfe 100644 (file)
--- a/modules/ffmpeg/producer/muxer/frame_muxer.cpp
+++ b/modules/ffmpeg/producer/muxer/frame_muxer.cpp
@@ -278,6 +278,9 @@ struct frame_muxer::impl : boost::noncopyable
                display_mode_ = display_mode::simple;\r
 \r
                auto mode = get_mode(*frame);\r
+               if(mode == core::field_mode::progressive && frame->height < 720) // SD frames are interlaced. Probably incorrect meta-data. Fix it.\r
+                       mode = core::field_mode::upper;\r
+\r
                auto fps  = in_fps_;\r
 \r
                if(filter::is_deinterlacing(filter_str_))\r