From 7180728cbad8196146010e12191e0b5f1ce560b1 Mon Sep 17 00:00:00 2001 From: Uoti Urpala Date: Sun, 19 Apr 2009 17:37:03 +0300 Subject: stheader.h: Allow inclusion before demuxer.h stheader.h used 'demuxer_t *' without including demuxer.h, causing compilation to fail if demuxer.h had not been included first. Use 'struct demuxer *' instead so the type does not need to be defined. --- libmpdemux/stheader.h | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/libmpdemux/stheader.h b/libmpdemux/stheader.h index 67fa0e1fb4..12a9144fc6 100644 --- a/libmpdemux/stheader.h +++ b/libmpdemux/stheader.h @@ -4,6 +4,7 @@ #include "aviheader.h" #include "ms_hdr.h" struct MPOpts; +struct demuxer; // Stream headers: @@ -111,12 +112,12 @@ typedef struct sh_sub { // demuxer.c: #define new_sh_audio(d, i) new_sh_audio_aid(d, i, i) -sh_audio_t* new_sh_audio_aid(demuxer_t *demuxer,int id,int aid); +sh_audio_t* new_sh_audio_aid(struct demuxer *demuxer,int id,int aid); #define new_sh_video(d, i) new_sh_video_vid(d, i, i) -sh_video_t* new_sh_video_vid(demuxer_t *demuxer,int id,int vid); +sh_video_t* new_sh_video_vid(struct demuxer *demuxer,int id,int vid); #define new_sh_sub(d, i) new_sh_sub_sid(d, i, i) -sh_sub_t *new_sh_sub_sid(demuxer_t *demuxer, int id, int sid); -void free_sh_audio(demuxer_t *demuxer, int id); +sh_sub_t *new_sh_sub_sid(struct demuxer *demuxer, int id, int sid); +void free_sh_audio(struct demuxer *demuxer, int id); void free_sh_video(sh_video_t *sh); // video.c: -- cgit v1.2.3