From 904c73d2d214c729fbeedc13c8b47afab91e296b Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Sat, 23 Nov 2013 21:37:56 +0100
Subject: demux: remove gsh field from sh_audio/sh_video/sh_sub

This used to be needed to access the generic stream header from the
specific headers, which in turn was needed because the decoders had
access only to the specific headers. This is not the case anymore, so
this can finally be removed again.

Also move the "format" field from the specific headers to sh_stream.
---
 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 592ad1608a..00d59af09d 100644
--- a/demux/demux.c
+++ b/demux/demux.c
@@ -247,19 +247,16 @@ struct sh_stream *new_sh_stream(demuxer_t *demuxer, enum stream_type type)
     switch (sh->type) {
         case STREAM_VIDEO: {
             struct sh_video *sht = talloc_zero(demuxer, struct sh_video);
-            sht->gsh = sh;
             sh->video = sht;
             break;
         }
         case STREAM_AUDIO: {
             struct sh_audio *sht = talloc_zero(demuxer, struct sh_audio);
-            sht->gsh = sh;
             sh->audio = sht;
             break;
         }
         case STREAM_SUB: {
             struct sh_sub *sht = talloc_zero(demuxer, struct sh_sub);
-            sht->gsh = sh;
             sh->sub = sht;
             break;
         }
-- 
cgit v1.2.3