summaryrefslogtreecommitdiffstats
path: root/mplayer.c
diff options
context:
space:
mode:
authorarpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-02-09 01:29:11 +0000
committerarpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-02-09 01:29:11 +0000
commit24739724b8e29300089c3b3e5a493c4dd78eafeb (patch)
tree614231f963a875389e6aae731586cf338ef7e9cc /mplayer.c
parent2f76bb1c0036d58308594b6264f8396a3e1c5983 (diff)
downloadmpv-24739724b8e29300089c3b3e5a493c4dd78eafeb.tar.bz2
mpv-24739724b8e29300089c3b3e5a493c4dd78eafeb.tar.xz
setting vo_fps, required for vo_yuv4mpeg
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4599 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'mplayer.c')
-rw-r--r--mplayer.c10
1 files changed, 9 insertions, 1 deletions
diff --git a/mplayer.c b/mplayer.c
index a59abd3d02..9de3eed45e 100644
--- a/mplayer.c
+++ b/mplayer.c
@@ -1065,6 +1065,14 @@ if(sh_video){
sh_video->fps,sh_video->frametime
);
+ vo_fps = sh_video->fps;
+ /* need to set fps here for output encoders to pick it up in their init */
+ if(force_fps){
+ sh_video->fps=force_fps;
+ sh_video->frametime=1.0f/sh_video->fps;
+ vo_fps = force_fps;
+ }
+
if(!sh_video->fps && !force_fps){
mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_FPSnotspecified);
sh_video=d_video->sh=NULL;
@@ -1476,7 +1484,7 @@ if(!sh_audio){
if(demuxer->file_format!=DEMUXER_TYPE_AVI) pts_from_bps=0; // it must be 0 for mpeg/asf!
if(force_fps){
- sh_video->fps=force_fps;
+ vo_fps = sh_video->fps=force_fps;
sh_video->frametime=1.0f/sh_video->fps;
mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_FPSforced,sh_video->fps,sh_video->frametime);
}