RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

simplified code to patch the video framerate (removed silly comparisons) 

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18163 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
nicodvb 2006-04-20 20:38:09 +00:00
parent 1cbc74c755
commit 471dc6e589
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
libmpdemux/muxer_mpeg.c
View File

@ -2733,33 +2733,35 @@ int muxer_init_muxer_mpeg(muxer_t *muxer){
{ {
int fps; int fps;
fps = (int) (conf_vframerate * 1000.0); fps = (int) (conf_vframerate * 1001 + 0.5);
switch(fps) switch(fps)
{ {
case 24000: case 24000:
priv->vframerate = FRAMERATE_23976;
break;
case 24024:
priv->vframerate = FRAMERATE_24; priv->vframerate = FRAMERATE_24;
break; break;
case 25000: case 25025:
priv->vframerate = FRAMERATE_25; priv->vframerate = FRAMERATE_25;
break; break;
case 30000: case 30000:
priv->vframerate = FRAMERATE_2997;
break;
case 30030:
priv->vframerate = FRAMERATE_30; priv->vframerate = FRAMERATE_30;
break; break;
case 50000: case 50050:
priv->vframerate = FRAMERATE_50; priv->vframerate = FRAMERATE_50;
break; break;
case 60000: case 60000:
priv->vframerate = FRAMERATE_5994;
break;
case 60060:
priv->vframerate = FRAMERATE_60; priv->vframerate = FRAMERATE_60;
break; break;
default: default:
if(fps >= 23975 && fps <= 23977) mp_msg(MSGT_MUXER, MSGL_ERR, "WRONG FPS: %d/1000, ignoring\n", fps);
priv->vframerate = FRAMERATE_23976;
else if(fps >= 29969 && fps <= 29971)
priv->vframerate = FRAMERATE_2997;
else if(fps >= 59939 && fps <= 59941)
priv->vframerate = FRAMERATE_5994;
else
mp_msg(MSGT_MUXER, MSGL_ERR, "WRONG FPS: %d/1000, ignoring\n", fps);
} }
} }