diff options
| author | nicodvb <nicodvb@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-04-20 20:38:09 +0000 |
|---|---|---|
| committer | nicodvb <nicodvb@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-04-20 20:38:09 +0000 |
| commit | 471dc6e5892def246a5bb481f918a10dd835a3e6 (patch) | |
| tree | 54d711b040dabe4da1482ce65e950116f32082af /libmpdemux | |
| parent | 1cbc74c7557bf6c6f76b81b1bff51f0ecaf2d4b4 (diff) | |
| download | mpv-471dc6e5892def246a5bb481f918a10dd835a3e6.tar.bz2 mpv-471dc6e5892def246a5bb481f918a10dd835a3e6.tar.xz | |
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
Diffstat (limited to 'libmpdemux')
| -rw-r--r-- | libmpdemux/muxer_mpeg.c | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/libmpdemux/muxer_mpeg.c b/libmpdemux/muxer_mpeg.c index 751fef2669..501060b18b 100644 --- a/libmpdemux/muxer_mpeg.c +++ b/libmpdemux/muxer_mpeg.c @@ -2733,33 +2733,35 @@ int muxer_init_muxer_mpeg(muxer_t *muxer){ { int fps; - fps = (int) (conf_vframerate * 1000.0); + fps = (int) (conf_vframerate * 1001 + 0.5); switch(fps) { case 24000: + priv->vframerate = FRAMERATE_23976; + break; + case 24024: priv->vframerate = FRAMERATE_24; break; - case 25000: + case 25025: priv->vframerate = FRAMERATE_25; break; case 30000: + priv->vframerate = FRAMERATE_2997; + break; + case 30030: priv->vframerate = FRAMERATE_30; break; - case 50000: + case 50050: priv->vframerate = FRAMERATE_50; break; case 60000: + priv->vframerate = FRAMERATE_5994; + break; + case 60060: priv->vframerate = FRAMERATE_60; break; default: - if(fps >= 23975 && fps <= 23977) - 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); + mp_msg(MSGT_MUXER, MSGL_ERR, "WRONG FPS: %d/1000, ignoring\n", fps); } } |