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 /demux/demux_mkv_timeline.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 'demux/demux_mkv_timeline.c')
| -rw-r--r-- | demux/demux_mkv_timeline.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/demux/demux_mkv_timeline.c b/demux/demux_mkv_timeline.c index 9212f6b39d..681f0b0760 100644 --- a/demux/demux_mkv_timeline.c +++ b/demux/demux_mkv_timeline.c @@ -485,7 +485,7 @@ static void check_track_compatibility(struct timeline *tl) if (s) { // There are actually many more things that in theory have to // match (though mpv's implementation doesn't care). - if (s->codec && m->codec && strcmp(s->codec, m->codec) != 0) + if (strcmp(s->codec->codec, m->codec->codec) != 0) MP_WARN(tl, "Timeline segments have mismatching codec.\n"); } else { MP_WARN(tl, "Source %s lacks %s stream with TID=%d, which " |