From e704821b759999057a9c7b1a8d7601fde3023ff1 Mon Sep 17 00:00:00 2001
From: nicodvb <nicodvb@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Mon, 4 Dec 2006 22:08:11 +0000
Subject: disable telecining when it can't be applied

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21502 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 libmpdemux/muxer_mpeg.c | 13 +++++++++++++
 1 file changed, 13 insertions(+)

(limited to 'libmpdemux')

diff --git a/libmpdemux/muxer_mpeg.c b/libmpdemux/muxer_mpeg.c
index 2b82d0a902..755d4c5ecd 100644
--- a/libmpdemux/muxer_mpeg.c
+++ b/libmpdemux/muxer_mpeg.c
@@ -2601,9 +2601,17 @@ int muxer_init_muxer_mpeg(muxer_t *muxer){
 		tfps *= 2;
 	}
 	
+	if(((tfps - sfps)>>1) > sfps)
+	{
+		mp_msg(MSGT_MUXER, MSGL_ERR, "ERROR! Framerate increment must be <= 1.5, telecining disabled\n");
+		conf_telecine = 0;
+	}
+	else
+	{
 	generate_flags(sfps, tfps);
 	conf_telecine = TELECINE_DGPULLDOWN;
 	conf_vframerate = conf_telecine_dest;
+	}
   }
 
   if(conf_vframerate)
@@ -2638,7 +2646,12 @@ int muxer_init_muxer_mpeg(muxer_t *muxer){
 			priv->vframerate = FRAMERATE_60;
 			break;
 		default:
+		{
 			mp_msg(MSGT_MUXER, MSGL_ERR, "WRONG FPS: %d/1000, ignoring\n", fps);
+			if(conf_telecine)
+				mp_msg(MSGT_MUXER, MSGL_ERR, "DISABLED TELECINING\n");
+			conf_telecine = 0;
+		}
 	}
   }
 
-- 
cgit v1.2.3