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/demux_ts.c | |
| 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/demux_ts.c')
| -rw-r--r-- | demux/demux_ts.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/demux/demux_ts.c b/demux/demux_ts.c index 6d41dfd939..40675fa6f5 100644 --- a/demux/demux_ts.c +++ b/demux/demux_ts.c @@ -2986,7 +2986,7 @@ static int ts_parse(demuxer_t *demuxer , ES_stream_t *es, unsigned char *packet, { sh_sub_t *sh_sub = demuxer->sub->sh; - if(sh_sub && sh_sub->gsh->tid == tss->pid) + if(sh_sub && sh_sub->gsh->demuxer_id == tss->pid) { ds = demuxer->sub; |