diff options
| author | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-12-04 23:37:17 +0000 |
|---|---|---|
| committer | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-12-04 23:37:17 +0000 |
| commit | 02bdc0ebfb2c98d5a242a5b5398f1042db76e7d3 (patch) | |
| tree | f61cc4b0ed47094b8c144e041a12a5429202baf3 /mencoder.c | |
| parent | 8f49d90eebe814ba12f3094ebbc986d99c6bf04e (diff) | |
| download | mpv-02bdc0ebfb2c98d5a242a5b5398f1042db76e7d3.tar.bz2 mpv-02bdc0ebfb2c98d5a242a5b5398f1042db76e7d3.tar.xz | |
fixed -fps with mencoder and fixed-rate files (avi etc)
patch by Ivan Szanto <szivan@duticai.TWI.TUDelft.NL>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8358 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'mencoder.c')
| -rw-r--r-- | mencoder.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/mencoder.c b/mencoder.c index f3a5bb1c8c..bc9786f6b4 100644 --- a/mencoder.c +++ b/mencoder.c @@ -500,6 +500,12 @@ sh_video=d_video->sh; sh_video->fps,sh_video->frametime ); + if(force_fps){ + sh_video->fps=force_fps; + sh_video->frametime=1.0f/sh_video->fps; + mp_msg(MSGT_MENCODER,MSGL_INFO,"input fps will be interpreted as %5.2f instead\n", sh_video->fps); + } + if(sh_audio && out_audio_codec<0){ mp_msg(MSGT_MENCODER,MSGL_FATAL,MSGTR_NoAudioEncoderSelected); mencoder_exit(1,NULL); |