disable telecining when it can't be applied

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21502 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
nicodvb 2006-12-04 22:08:11 +00:00
parent a176dc29b9
commit e704821b75
1 changed files with 13 additions and 0 deletions

View File

@ -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;
}
}
}