diff options
| author | wm4 <wm4@nowhere> | 2019-12-03 21:04:53 +0100 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2019-12-03 21:04:53 +0100 |
| commit | 370ed5777c6f0b7e89542bcd3357270b88e09e93 (patch) | |
| tree | 01cab3defe78fd1a50de0586947f713da34fb7f6 /demux/demux_mkv.c | |
| parent | b6f605285caaebedfb8882c36609099fdebc424f (diff) | |
| download | mpv-370ed5777c6f0b7e89542bcd3357270b88e09e93.tar.bz2 mpv-370ed5777c6f0b7e89542bcd3357270b88e09e93.tar.xz | |
demux: do not make up demuxer_id
The demuxer_id (exported in as "src-id" property) is supposed to be the
native stream ID, as it exists in the file, or -1 if that does not exist
(actually any negative value), or if it is unknown.
Until now, an ID was made up if it was missing. That seems like strange
non-sense, and I can't find the reason why it was done. But it was
probably for convenience by the EDL stuff or so.
Stop doing this. Fortunately, the src-id property was documented as
being unavailable if the ID is not known. Even the code for this was
present, it was just inactive until now. Extend input.rst with some
explanations.
Also fixing 3 other places where negative demuxer_id was ignored or
avoided.
Diffstat (limited to 'demux/demux_mkv.c')
| -rw-r--r-- | demux/demux_mkv.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/demux/demux_mkv.c b/demux/demux_mkv.c index 4c5f376137..99e481bc7d 100644 --- a/demux/demux_mkv.c +++ b/demux/demux_mkv.c @@ -1286,7 +1286,6 @@ static void add_coverart(struct demuxer *demuxer) if (!codec) continue; struct sh_stream *sh = demux_alloc_sh_stream(STREAM_VIDEO); - sh->demuxer_id = -1 - sh->index; // don't clash with mkv IDs sh->codec->codec = codec; sh->attached_picture = new_demux_packet_from(att->data, att->data_size); if (sh->attached_picture) { |