summaryrefslogtreecommitdiffstats
path: root/libmpdemux
diff options
context:
space:
mode:
Diffstat (limited to 'libmpdemux')
-rw-r--r--libmpdemux/demuxer.h6
-rw-r--r--libmpdemux/stheader.h6
2 files changed, 6 insertions, 6 deletions
diff --git a/libmpdemux/demuxer.h b/libmpdemux/demuxer.h
index ce7f872db7..a72e3f8a45 100644
--- a/libmpdemux/demuxer.h
+++ b/libmpdemux/demuxer.h
@@ -211,9 +211,9 @@ typedef struct demuxer_st {
demux_stream_t *sub; // dvd subtitle buffer/demuxer
// stream headers:
- void* a_streams[MAX_A_STREAMS]; // audio streams (sh_audio_t)
- void* v_streams[MAX_V_STREAMS]; // video sterams (sh_video_t)
- void *s_streams[MAX_S_STREAMS]; // dvd subtitles (flag)
+ struct sh_audio *a_streams[MAX_A_STREAMS];
+ struct sh_video *v_streams[MAX_V_STREAMS];
+ struct sh_sub *s_streams[MAX_S_STREAMS];
demux_chapter_t* chapters;
int num_chapters;
diff --git a/libmpdemux/stheader.h b/libmpdemux/stheader.h
index 7e761e6879..2ccd7fa4d0 100644
--- a/libmpdemux/stheader.h
+++ b/libmpdemux/stheader.h
@@ -7,7 +7,7 @@
// Stream headers:
-typedef struct {
+typedef struct sh_audio {
int aid;
demux_stream_t *ds;
struct codecs_st *codec;
@@ -54,7 +54,7 @@ typedef struct {
int default_track;
} sh_audio_t;
-typedef struct {
+typedef struct sh_video {
int vid;
demux_stream_t *ds;
struct codecs_st *codec;
@@ -94,7 +94,7 @@ typedef struct {
void* context; // codec-specific stuff (usually HANDLE or struct pointer)
} sh_video_t;
-typedef struct {
+typedef struct sh_sub {
int sid;
char type; // t = text, v = VobSub, a = SSA/ASS
int has_palette; // If we have a valid palette