Mercurial > mplayer.hg
annotate mpcommon.h @ 27750:2c11b155ff11
Move X11_FULLSCREEN definition to x11_common.h where it belongs.
config.h should only contain option definitions, no logic.
author | diego |
---|---|
date | Thu, 16 Oct 2008 18:19:36 +0000 |
parents | 9d53b15aed02 |
children | 21504ba0f5d3 |
rev | line source |
---|---|
26029 | 1 #ifndef MPLAYER_MPCOMMON_H |
2 #define MPLAYER_MPCOMMON_H | |
25553
6ac1ece1f9fe
Add multiple inclusion guards to all header files that lack them.
diego
parents:
24165
diff
changeset
|
3 |
26131
83c95bd31aab
Add necessary #includes to pass 'make checkheaders'.
diego
parents:
26090
diff
changeset
|
4 #include "subreader.h" |
83c95bd31aab
Add necessary #includes to pass 'make checkheaders'.
diego
parents:
26090
diff
changeset
|
5 #include "libmpdemux/demuxer.h" |
83c95bd31aab
Add necessary #includes to pass 'make checkheaders'.
diego
parents:
26090
diff
changeset
|
6 #include "libmpdemux/stheader.h" |
83c95bd31aab
Add necessary #includes to pass 'make checkheaders'.
diego
parents:
26090
diff
changeset
|
7 |
22233
5bf6c178f09a
Move some subtitle handling from mplayer.c to mpcommon.c and share it with mencoder.c
reimar
parents:
diff
changeset
|
8 extern double sub_last_pts; |
26008 | 9 extern struct ass_track_s *ass_track; |
22233
5bf6c178f09a
Move some subtitle handling from mplayer.c to mpcommon.c and share it with mencoder.c
reimar
parents:
diff
changeset
|
10 extern subtitle *vo_sub_last; |
5bf6c178f09a
Move some subtitle handling from mplayer.c to mpcommon.c and share it with mencoder.c
reimar
parents:
diff
changeset
|
11 void update_subtitles(sh_video_t *sh_video, demux_stream_t *d_dvdsub, int reset); |
24165 | 12 void update_teletext(sh_video_t *sh_video, demuxer_t *demuxer, int reset); |
26090
c585e2ad8ebf
Select audio stream in mplayer and mencoder, overriding demuxer decision.
eugeni
parents:
26029
diff
changeset
|
13 int select_audio(demuxer_t* demuxer, int audio_id, char* audio_lang); |
25553
6ac1ece1f9fe
Add multiple inclusion guards to all header files that lack them.
diego
parents:
24165
diff
changeset
|
14 |
26416 | 15 extern int disable_system_conf; |
16 extern int disable_user_conf; | |
17 | |
26029 | 18 #endif /* MPLAYER_MPCOMMON_H */ |