diff options
| author | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-08-26 19:17:04 +0000 |
|---|---|---|
| committer | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-08-26 19:17:04 +0000 |
| commit | ccf75d67117745e3ed868d0f1c956f078f13a4fa (patch) | |
| tree | b5a87e723273c61279c39b1491b685519d4a2086 /libmpdemux/demux_ts.c | |
| parent | 8b4274d71f055c9c1354413933c4ba071bfac288 (diff) | |
| download | mpv-ccf75d67117745e3ed868d0f1c956f078f13a4fa.tar.bz2 mpv-ccf75d67117745e3ed868d0f1c956f078f13a4fa.tar.xz | |
Get rid of demux_aid_vid_mismatch mess.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19546 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux/demux_ts.c')
| -rw-r--r-- | libmpdemux/demux_ts.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/libmpdemux/demux_ts.c b/libmpdemux/demux_ts.c index 82a5504e9a..01c8ee69f5 100644 --- a/libmpdemux/demux_ts.c +++ b/libmpdemux/demux_ts.c @@ -62,7 +62,6 @@ int ts_prog; int ts_keep_broken=0; off_t ts_probe = TS_MAX_PROBE_SIZE; extern char *dvdsub_lang, *audio_lang; //for -alang -extern int demux_aid_vid_mismatch; typedef enum { @@ -935,12 +934,10 @@ static demuxer_t *demux_open_ts(demuxer_t * demuxer) demuxer->sub->id = params.spid; priv->prog = params.prog; - demux_aid_vid_mismatch = 1; // don't identify in new_sh_* since ids don't match - if(params.vtype != UNKNOWN) { ES_stream_t *es = priv->ts.pids[params.vpid]; - sh_video = new_sh_video(demuxer, 0); + sh_video = new_sh_video_vid(demuxer, 0, es->pid); if(params.vtype == VIDEO_AVC && es->extradata && es->extradata_len) { int w = 0, h = 0; @@ -966,7 +963,7 @@ static demuxer_t *demux_open_ts(demuxer_t * demuxer) if(params.atype != UNKNOWN) { ES_stream_t *es = priv->ts.pids[params.apid]; - sh_audio = new_sh_audio(demuxer, 0); + sh_audio = new_sh_audio_aid(demuxer, 0, es->pid); priv->ts.streams[params.apid].id = 0; priv->ts.streams[params.apid].sh = sh_audio; priv->ts.streams[params.apid].type = TYPE_AUDIO; @@ -2756,7 +2753,7 @@ static int ts_parse(demuxer_t *demuxer , ES_stream_t *es, unsigned char *packet, { if((IS_AUDIO(tss->type) || IS_AUDIO(tss->subtype)) && is_start && !priv->ts.streams[pid].sh && priv->last_aid+1 < MAX_A_STREAMS) { - sh_audio_t *sh = new_sh_audio(demuxer, priv->last_aid+1); + sh_audio_t *sh = new_sh_audio_aid(demuxer, priv->last_aid+1, pid); if(sh) { sh->format = IS_AUDIO(tss->type) ? tss->type : tss->subtype; |