1 files changed, 0 insertions, 18 deletions
diff --git a/demux/stheader.h b/demux/stheader.h
index ff98430a65..b2dc2018d2 100644
--- a/demux/stheader.h
+++ b/demux/stheader.h
@@ -24,7 +24,6 @@
 #include "codec_tags.h"
 
 #include "audio/chmap.h"
-#include "aviheader.h"
 #include "ms_hdr.h"
 struct MPOpts;
 struct demuxer;
@@ -43,8 +42,6 @@ struct sh_stream {
     struct demuxer *demuxer;
     // Index into demuxer->streams.
     int index;
-    // Index into stream array (currently one array per type, e.g. a_streams).
-    int stream_index;
     // Demuxer/format specific ID. Corresponds to the stream IDs as encoded in
     // some file formats (e.g. MPEG), or an index chosen by demux.c.
     int demuxer_id;
@@ -113,16 +110,11 @@ typedef struct sh_audio {
     struct af_stream *afilter;          // the audio filter stream
     const struct ad_functions *ad_driver;
     // win32-compatible codec parameters:
-    AVIStreamHeader audio;
     WAVEFORMATEX *wf;
     // note codec extradata may be either under "wf" or "codecdata"
     unsigned char *codecdata;
     int codecdata_len;
     int pts_bytes;   // bytes output by decoder after last known pts
-    /* things needed for parsing */
-    bool needs_parsing;
-    struct AVCodecContext *avctx;
-    struct AVCodecParserContext *parser;
 } sh_audio_t;
 
 typedef struct sh_video {
@@ -153,7 +145,6 @@ typedef struct sh_video {
     const struct vd_functions *vd_driver;
     int vf_initialized;   // -1 failed, 0 not done, 1 done
     // win32-compatible codec parameters:
-    AVIStreamHeader video;
     BITMAPINFOHEADER *bih;
 } sh_video_t;
 
@@ -168,18 +159,9 @@ typedef struct sh_sub {
 } sh_sub_t;
 
 // demuxer.c:
-#define new_sh_audio(d, i) new_sh_audio_aid(d, i, i)
-struct sh_audio *new_sh_audio_aid(struct demuxer *demuxer, int id, int aid);
-#define new_sh_video(d, i) new_sh_video_vid(d, i, i)
-struct sh_video *new_sh_video_vid(struct demuxer *demuxer, int id, int vid);
-#define new_sh_sub(d, i) new_sh_sub_sid(d, i, i)
-struct sh_sub *new_sh_sub_sid(struct demuxer *demuxer, int id, int sid);
-struct sh_sub *new_sh_sub_sid_lang(struct demuxer *demuxer, int id, int sid,
-                                   const char *lang);
 struct sh_stream *new_sh_stream(struct demuxer *demuxer, enum stream_type type);
 
 // video.c:
-int video_read_properties(struct sh_video *sh_video);
 int video_read_frame(struct sh_video *sh_video, float *frame_time_ptr,
                      unsigned char **start, int force_fps);