]> git.sesse.net Git - casparcg/commitdiff
git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches...
authorronag <ronag@362d55ac-95cf-4e76-9f9a-cbaa9c17b72d>
Sat, 10 Mar 2012 10:38:42 +0000 (10:38 +0000)
committerronag <ronag@362d55ac-95cf-4e76-9f9a-cbaa9c17b72d>
Sat, 10 Mar 2012 10:38:42 +0000 (10:38 +0000)
modules/ffmpeg/producer/muxer/frame_muxer.cpp

index 17e8a2c2b92a6940cc6d1b03ef1e34cfc2fabbfe..639e3976fc98e4cee7fcdac7ac102edee04ec163 100644 (file)
@@ -278,7 +278,7 @@ 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
+               if(mode == core::field_mode::progressive && frame->height < 720 && in_fps_ < 50.0) // SD frames are interlaced. Probably incorrect meta-data. Fix it.\r
                        mode = core::field_mode::upper;\r
 \r
                auto fps  = in_fps_;\r