diff options
| author | wm4 <wm4@nowhere> | 2016-01-12 23:48:19 +0100 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2016-01-12 23:48:19 +0100 |
| commit | 671df54e4dcf0675c335483d26f7f6ff9baaf76a (patch) | |
| tree | 6a206ddf489474150fffa2eac651b5e8915b969c /player/sub.c | |
| parent | 81f3b3aafe72e5ca9ac79d29246e70dce76ebca9 (diff) | |
| download | mpv-671df54e4dcf0675c335483d26f7f6ff9baaf76a.tar.bz2 mpv-671df54e4dcf0675c335483d26f7f6ff9baaf76a.tar.xz | |
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/sub.c')
| -rw-r--r-- | player/sub.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/player/sub.c b/player/sub.c index 5f2f13e88f..0492be4bc8 100644 --- a/player/sub.c +++ b/player/sub.c @@ -118,9 +118,9 @@ static bool init_subdec(struct MPContext *mpctx, struct track *track) if (!track->dec_sub) return false; - struct sh_video *sh_video = - mpctx->d_video ? mpctx->d_video->header->video : NULL; - double fps = sh_video ? sh_video->fps : 25; + struct mp_codec_params *v_c = + mpctx->d_video ? mpctx->d_video->header->codec : NULL; + double fps = v_c ? v_c->fps : 25; sub_control(track->dec_sub, SD_CTRL_SET_VIDEO_DEF_FPS, &fps); // Don't do this if the file has video/audio streams. Don't do it even |