Mercurial > mplayer.hg

annotate mpcommon.h @ 30374:e216d80cd56c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
typo fix, accidently reverted the new year patch with previous commit
author Gabrov
date Sun, 24 Jan 2010 03:19:47 +0000
parents d5d20b8256b7
children c1a3f1bbba26
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
26029
4129c8cfa742 Add MPLAYER_ prefix to multiple inclusion guards.
diego
parents: 26008
diff changeset
1 #ifndef MPLAYER_MPCOMMON_H
4129c8cfa742 Add MPLAYER_ prefix to multiple inclusion guards.
diego
parents: 26008
diff changeset
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"
30065
d5d20b8256b7 Some ugly hacks to make compiling against a newer external version of libass work.
reimar
parents: 29670
diff changeset
7 #include "libass/ass_mp.h"
26131
83c95bd31aab Add necessary #includes to pass 'make checkheaders'.
diego
parents: 26090
diff changeset
8
22233
5bf6c178f09a Move some subtitle handling from mplayer.c to mpcommon.c and share it with mencoder.c
reimar
parents:
diff changeset
9 extern double sub_last_pts;
30065
d5d20b8256b7 Some ugly hacks to make compiling against a newer external version of libass work.
reimar
parents: 29670
diff changeset
10 extern ass_track_t *ass_track;
22233
5bf6c178f09a Move some subtitle handling from mplayer.c to mpcommon.c and share it with mencoder.c
reimar
parents:
diff changeset
11 extern subtitle *vo_sub_last;
28325
21504ba0f5d3 Factorize print_version().
diego
parents: 26416
diff changeset
12
21504ba0f5d3 Factorize print_version().
diego
parents: 26416
diff changeset
13 void print_version(const char* name);
29669
162402f4662b Make function argument name in header match name in .c file.
reimar
parents: 29668
diff changeset
14 void update_subtitles(sh_video_t *sh_video, double refpts, demux_stream_t *d_dvdsub, int reset);
24165
94cac0aa431b Fix warning:
diego
parents: 24157
diff changeset
15 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
16 int select_audio(demuxer_t* demuxer, int audio_id, char* audio_lang);
29670
2e3751815a21 Add support for displaying subtitles on the command-line when playing
reimar
parents: 29669
diff changeset
17 void set_osd_subtitle(subtitle *subs);
25553
6ac1ece1f9fe Add multiple inclusion guards to all header files that lack them.
diego
parents: 24165
diff changeset
18
26416
9d53b15aed02 Add options to disable some or all config files.
albeu
parents: 26131
diff changeset
19 extern int disable_system_conf;
9d53b15aed02 Add options to disable some or all config files.
albeu
parents: 26131
diff changeset
20 extern int disable_user_conf;
9d53b15aed02 Add options to disable some or all config files.
albeu
parents: 26131
diff changeset
21
26029
4129c8cfa742 Add MPLAYER_ prefix to multiple inclusion guards.
diego
parents: 26008
diff changeset
22 #endif /* MPLAYER_MPCOMMON_H */