From: Helge Norberg <helge.norberg@svt.se>
Date: Wed, 5 Oct 2016 08:52:15 +0000 (+0200)
Subject: [ffmpeg_producer] Don't assume interlaced material based on resolution.
X-Git-Tag: 2.1.0_Beta1~37
X-Git-Url: https://git.sesse.net/?p=casparcg;a=commitdiff_plain;h=ced820bac19b0ec789bb531369dae9aaf08eae64

[ffmpeg_producer] Don't assume interlaced material based on resolution.
---

diff --git a/modules/ffmpeg/producer/muxer/frame_muxer.cpp b/modules/ffmpeg/producer/muxer/frame_muxer.cpp
index 1b6cedf90..cbd243244 100644
--- a/modules/ffmpeg/producer/muxer/frame_muxer.cpp
+++ b/modules/ffmpeg/producer/muxer/frame_muxer.cpp
@@ -304,8 +304,6 @@ private:
 		display_mode_ = display_mode::simple;
 
 		auto mode = get_mode(*frame);
-		if (mode == core::field_mode::progressive && frame->height < 720 && in_framerate_ < 50) // SD frames are interlaced. Probably incorrect meta-data. Fix it.
-			mode = core::field_mode::upper;
 
 		if (filter::is_deinterlacing(filter_str_))
 		{