diff options
author | wm4 <wm4@nowhere> | 2013-11-23 21:41:40 +0100 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2013-11-23 21:41:40 +0100 |
commit | f90e7ef7eafa0d5b1933f93bb116011cf1cb74b1 (patch) | |
tree | 56bd6201e2bd2f0d54eadeb24c8b888703d87c77 /video/decode/dec_video.h | |
parent | de68b8f23c8cfbf5967aa73b08835f75ac0f152e (diff) | |
download | mpv-f90e7ef7eafa0d5b1933f93bb116011cf1cb74b1.tar.bz2 mpv-f90e7ef7eafa0d5b1933f93bb116011cf1cb74b1.tar.xz |
video: don't overwrite demuxer FPS value
If the --fps option was given (MPOpts->force_fps), the demuxer FPS value
was overwritten with the forced value. This was fine, since the demuxer
value wasn't needed anymore. But with the recent changes not to write to
the demuxer stream headers, we don't want to do this anymore. So
maintain the (forced/updated) FPS value in dec_video->fps.
The removed code in loadfile.c is probably redundant, and an artifact
from past refactorings.
Note that sub.c will now always use the demuxer FPS value, instead of
the user override value. I think this is fine, because it used the
demuxer's video size values too. (And it's rare that these values are
used at all.)
Diffstat (limited to 'video/decode/dec_video.h')
-rw-r--r-- | video/decode/dec_video.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/video/decode/dec_video.h b/video/decode/dec_video.h index ef0ff925ce..9f01d32947 100644 --- a/video/decode/dec_video.h +++ b/video/decode/dec_video.h @@ -57,7 +57,7 @@ struct dec_video { float stream_aspect; // aspect ratio in media headers (DVD IFO files) int i_bps; // == bitrate (compressed bytes/sec) - + float fps; // FPS from demuxer or from user override float initial_decoder_aspect; }; |