Mercurial > mplayer.hg

annotate mpcommon.h @ 30828:5f145a3b3832

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Commit files by Steinar Gunderson, forgotten in r30866. Fixes compilation on x86-32.
author cehoyos
date Tue, 09 Mar 2010 12:00:30 +0000
parents c1a3f1bbba26
children eb1b97313903
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
30429
c1a3f1bbba26 Add license header to all top-level files missing them.
diego
parents: 30065
diff changeset
1 /*
c1a3f1bbba26 Add license header to all top-level files missing them.
diego
parents: 30065
diff changeset
2 * This file is part of MPlayer.
c1a3f1bbba26 Add license header to all top-level files missing them.
diego
parents: 30065
diff changeset
3 *
c1a3f1bbba26 Add license header to all top-level files missing them.
diego
parents: 30065
diff changeset
4 * MPlayer is free software; you can redistribute it and/or modify
c1a3f1bbba26 Add license header to all top-level files missing them.
diego
parents: 30065
diff changeset
5 * it under the terms of the GNU General Public License as published by
c1a3f1bbba26 Add license header to all top-level files missing them.
diego
parents: 30065
diff changeset
6 * the Free Software Foundation; either version 2 of the License, or
c1a3f1bbba26 Add license header to all top-level files missing them.
diego
parents: 30065
diff changeset
7 * (at your option) any later version.
c1a3f1bbba26 Add license header to all top-level files missing them.
diego
parents: 30065
diff changeset
8 *
c1a3f1bbba26 Add license header to all top-level files missing them.
diego
parents: 30065
diff changeset
9 * MPlayer is distributed in the hope that it will be useful,
c1a3f1bbba26 Add license header to all top-level files missing them.
diego
parents: 30065
diff changeset
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
c1a3f1bbba26 Add license header to all top-level files missing them.
diego
parents: 30065
diff changeset
11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
c1a3f1bbba26 Add license header to all top-level files missing them.
diego
parents: 30065
diff changeset
12 * GNU General Public License for more details.
c1a3f1bbba26 Add license header to all top-level files missing them.
diego
parents: 30065
diff changeset
13 *
c1a3f1bbba26 Add license header to all top-level files missing them.
diego
parents: 30065
diff changeset
14 * You should have received a copy of the GNU General Public License along
c1a3f1bbba26 Add license header to all top-level files missing them.
diego
parents: 30065
diff changeset
15 * with MPlayer; if not, write to the Free Software Foundation, Inc.,
c1a3f1bbba26 Add license header to all top-level files missing them.
diego
parents: 30065
diff changeset
16 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
c1a3f1bbba26 Add license header to all top-level files missing them.
diego
parents: 30065
diff changeset
17 */
c1a3f1bbba26 Add license header to all top-level files missing them.
diego
parents: 30065
diff changeset
18
26029
4129c8cfa742 Add MPLAYER_ prefix to multiple inclusion guards.
diego
parents: 26008
diff changeset
19 #ifndef MPLAYER_MPCOMMON_H
4129c8cfa742 Add MPLAYER_ prefix to multiple inclusion guards.
diego
parents: 26008
diff changeset
20 #define MPLAYER_MPCOMMON_H
25553
6ac1ece1f9fe Add multiple inclusion guards to all header files that lack them.
diego
parents: 24165
diff changeset
21
26131
83c95bd31aab Add necessary #includes to pass 'make checkheaders'.
diego
parents: 26090
diff changeset
22 #include "subreader.h"
83c95bd31aab Add necessary #includes to pass 'make checkheaders'.
diego
parents: 26090
diff changeset
23 #include "libmpdemux/demuxer.h"
83c95bd31aab Add necessary #includes to pass 'make checkheaders'.
diego
parents: 26090
diff changeset
24 #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
25 #include "libass/ass_mp.h"
26131
83c95bd31aab Add necessary #includes to pass 'make checkheaders'.
diego
parents: 26090
diff changeset
26
22233
5bf6c178f09a Move some subtitle handling from mplayer.c to mpcommon.c and share it with mencoder.c
reimar
parents:
diff changeset
27 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
28 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
29 extern subtitle *vo_sub_last;
28325
21504ba0f5d3 Factorize print_version().
diego
parents: 26416
diff changeset
30
21504ba0f5d3 Factorize print_version().
diego
parents: 26416
diff changeset
31 void print_version(const char* name);
29669
162402f4662b Make function argument name in header match name in .c file.
reimar
parents: 29668
diff changeset
32 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
33 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
34 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
35 void set_osd_subtitle(subtitle *subs);
25553
6ac1ece1f9fe Add multiple inclusion guards to all header files that lack them.
diego
parents: 24165
diff changeset
36
26416
9d53b15aed02 Add options to disable some or all config files.
albeu
parents: 26131
diff changeset
37 extern int disable_system_conf;
9d53b15aed02 Add options to disable some or all config files.
albeu
parents: 26131
diff changeset
38 extern int disable_user_conf;
9d53b15aed02 Add options to disable some or all config files.
albeu
parents: 26131
diff changeset
39
26029
4129c8cfa742 Add MPLAYER_ prefix to multiple inclusion guards.
diego
parents: 26008
diff changeset
40 #endif /* MPLAYER_MPCOMMON_H */