diff options
| author | henry <henry@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2005-08-22 20:04:42 +0000 |
|---|---|---|
| committer | henry <henry@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2005-08-22 20:04:42 +0000 |
| commit | 5e220d0356bb01fb4367ede1e9e5cab805391d5d (patch) | |
| tree | 9f8f0043241027fba53532dae203a4a0c07bcdc6 | |
| parent | 999c4374c63126bd13c696071a06f1591014a10f (diff) | |
| download | mpv-5e220d0356bb01fb4367ede1e9e5cab805391d5d.tar.bz2 mpv-5e220d0356bb01fb4367ede1e9e5cab805391d5d.tar.xz | |
mode fps int vs. float woes
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16290 b3059339-0415-0410-9bf9-f77b7e298cf2
| -rw-r--r-- | libmpdemux/tvi_v4l2.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libmpdemux/tvi_v4l2.c b/libmpdemux/tvi_v4l2.c index c34a237402..a04e73f5cf 100644 --- a/libmpdemux/tvi_v4l2.c +++ b/libmpdemux/tvi_v4l2.c @@ -556,7 +556,7 @@ static int control(priv_t *priv, int cmd, void *arg) priv->immediate_mode = 1; return TVI_CONTROL_TRUE; case TVI_CONTROL_VID_GET_FPS: - *(float *)arg = priv->standard.frameperiod.denominator / + *(float *)arg = (float)priv->standard.frameperiod.denominator / priv->standard.frameperiod.numerator; mp_msg(MSGT_TV, MSGL_V, "%s: get fps: %f\n", info.short_name, *(float *)arg); @@ -1218,8 +1218,8 @@ static int start(priv_t *priv) /* setup video parameters */ if (!tv_param_noaudio) { - if (priv->video_buffer_size_max < 3.0*(priv->standard.frameperiod.denominator / - priv->standard.frameperiod.numerator) + if (priv->video_buffer_size_max < (3*priv->standard.frameperiod.denominator) / + priv->standard.frameperiod.numerator *priv->audio_secs_per_block) { mp_msg(MSGT_TV, MSGL_ERR, "Video buffer shorter than 3 times audio frame duration.\n" "You will probably experience heavy framedrops.\n"); |