Mercurial > mplayer.hg

changeset 32095:96bdac8d878d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author reimar
date Sun, 12 Sep 2010 11:21:12 +0000
parents bd219c185f29
children 06519a2a9c77
files mpcommon.h
diffstat 1 files changed, 2 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/mpcommon.h	Sun Sep 12 11:12:06 2010 +0000
+++ b/mpcommon.h	Sun Sep 12 11:21:12 2010 +0000
@@ -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 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);