From 2adb1aaa5d5e7a8240cab8afba639b768e486fca Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Mon, 15 Apr 2013 21:22:41 +0200
Subject: demux: remove useless vid/aid/sid fields

Only demux_ts.c used sid in one case, replace that by reading the same
value from another location.
---
 demux/demux.c | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'demux/demux.c')

diff --git a/demux/demux.c b/demux/demux.c
index 7d76bfa56e..c23185c90b 100644
--- a/demux/demux.c
+++ b/demux/demux.c
@@ -279,7 +279,6 @@ static struct sh_stream *new_sh_stream_id(demuxer_t *demuxer,
     switch (sh->type) {
         case STREAM_VIDEO: {
             struct sh_video *sht = talloc_zero(demuxer, struct sh_video);
-            sht->vid = sh->tid;
             sht->ds = demuxer->video;
             sh->video = sht;
             sh->common_header = (struct sh_common *) sht;
@@ -288,7 +287,6 @@ static struct sh_stream *new_sh_stream_id(demuxer_t *demuxer,
         }
         case STREAM_AUDIO: {
             struct sh_audio *sht = talloc_zero(demuxer, struct sh_audio);
-            sht->aid = tid;
             sht->ds = demuxer->audio;
             sht->samplesize = 2;
             sht->sample_format = AF_FORMAT_S16_NE;
@@ -299,7 +297,6 @@ static struct sh_stream *new_sh_stream_id(demuxer_t *demuxer,
         }
         case STREAM_SUB: {
             struct sh_sub *sht = talloc_zero(demuxer, struct sh_sub);
-            sht->sid = tid;
             sht->ds = demuxer->sub;
             sh->sub = sht;
             sh->common_header = (struct sh_common *) sht;
-- 
cgit v1.2.3