[MPlayer-cvslog] r32179 - trunk/mpcommon.h

[reimar]

Author: reimar
Date: Sun Sep 12 13:21:12 2010
New Revision: 32179

Log:
Remove stheader.h include from mpcommon.h since it
conflicts with the windows.h header and thus causes compilation
errors e.g. in asf_streaming_mmst.c.

Modified:
   trunk/mpcommon.h

Modified: trunk/mpcommon.h
==============================================================================
--- trunk/mpcommon.h	Sun Sep 12 13:12:06 2010	(r32178)
+++ trunk/mpcommon.h	Sun Sep 12 13:21:12 2010	(r32179)
@@ -23,7 +23,6 @@
 #include "m_option.h"
 #include "subreader.h"
 #include "libmpdemux/demuxer.h"
-#include "libmpdemux/stheader.h"
 #include "libass/ass_mp.h"
 
 extern double sub_last_pts;
@@ -62,8 +61,8 @@ extern m_config_t *mconfig;
 extern const m_option_t noconfig_opts[];
 
 void print_version(const char* name);
-void update_subtitles(sh_video_t *sh_video, double refpts, demux_stream_t *d_dvdsub, int reset);
-void update_teletext(sh_video_t *sh_video, demuxer_t *demuxer, int reset);
+void update_subtitles(struct sh_video *sh_video, double refpts, demux_stream_t *d_dvdsub, int reset);
+void update_teletext(struct sh_video *sh_video, demuxer_t *demuxer, int reset);
 int select_audio(demuxer_t* demuxer, int audio_id, char* audio_lang);
 void set_osd_subtitle(subtitle *subs);