summaryrefslogtreecommitdiffstats
path: root/mpcommon.h
diff options
context:
space:
mode:
authorUoti Urpala <uau@glyph.nonexistent.invalid>2009-04-08 02:43:44 +0300
committerUoti Urpala <uau@glyph.nonexistent.invalid>2009-04-08 02:43:44 +0300
commit53eeb0e41238699fb11701c357941f904338bb25 (patch)
tree965f3585bc690f9b5f654f1022a4c02709911706 /mpcommon.h
parentb309b60a0c7230fae29475e8924ff51f107c2563 (diff)
parent96daf7ed5ef96b86f2539164c27155bc830aa2a6 (diff)
downloadmpv-53eeb0e41238699fb11701c357941f904338bb25.tar.bz2
mpv-53eeb0e41238699fb11701c357941f904338bb25.tar.xz
Merge branch 'ordered_chapters'
Diffstat (limited to 'mpcommon.h')
-rw-r--r--mpcommon.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/mpcommon.h b/mpcommon.h
index a0c6fb8ff8..c9bfd92122 100644
--- a/mpcommon.h
+++ b/mpcommon.h
@@ -10,7 +10,8 @@ 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, demux_stream_t *d_dvdsub, int reset);
+void update_subtitles(sh_video_t *sh_video, demux_stream_t *d_dvdsub,
+ double video_offset, 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);