path: root/player/video.c
diff options
authorwm4 <wm4@nowhere>2016-01-12 23:48:19 +0100
committerwm4 <wm4@nowhere>2016-01-12 23:48:19 +0100
commit671df54e4dcf0675c335483d26f7f6ff9baaf76a (patch)
tree6a206ddf489474150fffa2eac651b5e8915b969c /player/video.c
parent81f3b3aafe72e5ca9ac79d29246e70dce76ebca9 (diff)
demux: merge sh_video/sh_audio/sh_sub
This is mainly a refactor. I'm hoping it will make some things easier in the future due to cleanly separating codec metadata and stream metadata. Also, declare that the "codec" field can not be NULL anymore. demux.c will set it to "" if it's NULL when added. This gets rid of a corner case everything had to handle, but which rarely happened.
Diffstat (limited to 'player/video.c')
1 files changed, 2 insertions, 2 deletions
diff --git a/player/video.c b/player/video.c
index 7f1ab4dc21..d54f048038 100644
--- a/player/video.c
+++ b/player/video.c
@@ -277,10 +277,10 @@ int reinit_video_chain(struct MPContext *mpctx)
d_video->log = mp_log_new(d_video, mpctx->log, "!vd");
d_video->opts = mpctx->opts;
d_video->header = sh;
- d_video->fps = sh->video->fps;
+ d_video->fps = sh->codec->fps;
d_video->vo = mpctx->video_out;
- MP_VERBOSE(d_video, "Container reported FPS: %f\n", sh->video->fps);
+ MP_VERBOSE(d_video, "Container reported FPS: %f\n", sh->codec->fps);
if (opts->force_fps) {
d_video->fps = opts->force_fps;