summaryrefslogtreecommitdiffstats
path: root/demux/demux.c
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-04-15 21:22:41 +0200
committerwm4 <wm4@nowhere>2013-04-20 23:28:25 +0200
commit2adb1aaa5d5e7a8240cab8afba639b768e486fca (patch)
treedf29b68cc353177ce3cffccef71c5f497e418c40 /demux/demux.c
parentafd8d7f2db68e06fa0a6a609be45573adef2c1de (diff)
downloadmpv-2adb1aaa5d5e7a8240cab8afba639b768e486fca.tar.bz2
mpv-2adb1aaa5d5e7a8240cab8afba639b768e486fca.tar.xz
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.
Diffstat (limited to 'demux/demux.c')
-rw-r--r--demux/demux.c3
1 files changed, 0 insertions, 3 deletions
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;