Mercurial > mplayer.hg
comparison mpcommon.h @ 29668:ecc719c6d7a9
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 |
comparison
equal
deleted
inserted
replaced
| 29667:8cfbe411de01 | 29668:ecc719c6d7a9 |
|---|---|
| 8 extern double sub_last_pts; | 8 extern double sub_last_pts; |
| 9 extern struct ass_track_s *ass_track; | 9 extern struct ass_track_s *ass_track; |
| 10 extern subtitle *vo_sub_last; | 10 extern subtitle *vo_sub_last; |
| 11 | 11 |
| 12 void print_version(const char* name); | 12 void print_version(const char* name); |
| 13 void update_subtitles(sh_video_t *sh_video, demux_stream_t *d_dvdsub, int reset); | 13 void update_subtitles(sh_video_t *sh_video, double pts, demux_stream_t *d_dvdsub, int reset); |
| 14 void update_teletext(sh_video_t *sh_video, demuxer_t *demuxer, int reset); | 14 void update_teletext(sh_video_t *sh_video, demuxer_t *demuxer, int reset); |
| 15 int select_audio(demuxer_t* demuxer, int audio_id, char* audio_lang); | 15 int select_audio(demuxer_t* demuxer, int audio_id, char* audio_lang); |
| 16 | 16 |
| 17 extern int disable_system_conf; | 17 extern int disable_system_conf; |
| 18 extern int disable_user_conf; | 18 extern int disable_user_conf; |