diff options
| author | wm4 <wm4@nowhere> | 2013-04-29 22:34:36 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2013-04-29 22:59:15 +0200 |
| commit | 1c96f51e36593d43843e8bd41cee49a2bee5e4dc (patch) | |
| tree | 599eaf317b1aa29af5c0a5c1b6fc916ac7ab0769 /demux/stheader.h | |
| parent | 2d8783075f788b9486a13e929871077850faa230 (diff) | |
| download | mpv-1c96f51e36593d43843e8bd41cee49a2bee5e4dc.tar.bz2 mpv-1c96f51e36593d43843e8bd41cee49a2bee5e4dc.tar.xz | |
demux: simplify stream ID business, fix issue with cover art
The stream ID handling as it was changed in commit 654c34f was still
a little bit insane, and caused a regression with the cover art hack
(the stream set in demux->video->sh was incorrect for demux_lavf).
Simplify by always using stream_index for demux_stream->id, and getting
rid of that tid thing. It turns out that the id for subtitles isn't
special either (maybe demux_ts.c was the only thing left that required
this).
Diffstat (limited to 'demux/stheader.h')
| -rw-r--r-- | demux/stheader.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/demux/stheader.h b/demux/stheader.h index af4ceaff16..2bbb74160e 100644 --- a/demux/stheader.h +++ b/demux/stheader.h @@ -42,11 +42,10 @@ struct sh_stream { struct demuxer *demuxer; // Index into demuxer->streams. int index; - // The (possibly) type specific id, e.g. aid or sid. - int tid; // Index into stream array (currently one array per type, e.g. a_streams). int stream_index; - // Demuxer specific ID (always set, defaults to tid). + // Demuxer/format specific ID. Corresponds to the stream IDs as encoded in + // some file formats (e.g. MPEG), or an index chosen by demux.c. int demuxer_id; // One of these is non-NULL, the others are NULL, depending on the stream // type. |