Mercurial > mplayer.hg

view mpcommon.h @ 29668:ecc719c6d7a9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Make update_subtitles work without sh_video for text subtitles. This fixes a crash with e.g. auto-enabled subtitles and -novideo due to command.c calling update_subtitles even without video and is a step toward subtitle support for audio-only files.
author reimar
date Wed, 23 Sep 2009 21:21:58 +0000
parents 21504ba0f5d3
children 162402f4662b
line wrap: on
line source

#ifndef MPLAYER_MPCOMMON_H
#define MPLAYER_MPCOMMON_H

#include "subreader.h"
#include "libmpdemux/demuxer.h"
#include "libmpdemux/stheader.h"

extern double sub_last_pts;
extern struct ass_track_s *ass_track;
extern subtitle *vo_sub_last;

void print_version(const char* name);
void update_subtitles(sh_video_t *sh_video, double pts, demux_stream_t *d_dvdsub, int reset);
void update_teletext(sh_video_t *sh_video, demuxer_t *demuxer, int reset);
int select_audio(demuxer_t* demuxer, int audio_id, char* audio_lang);

extern int disable_system_conf;
extern int disable_user_conf;

#endif /* MPLAYER_MPCOMMON_H */