diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-01-26 00:58:15 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-01-26 00:58:15 +0200 |
| commit | dd888b05ff3af1c6c35582e75bedae687d38fc66 (patch) | |
| tree | 7f6f162208cd2d32a6a7ac2cfa886e8befadf4f9 /mpcommon.h | |
| parent | 0406d951209df261970424256d76f293649ec140 (diff) | |
| parent | 85b28eb411cfa304f1714219ebd17b10a0977fa3 (diff) | |
| download | mpv-dd888b05ff3af1c6c35582e75bedae687d38fc66.tar.bz2 mpv-dd888b05ff3af1c6c35582e75bedae687d38fc66.tar.xz | |
Merge svn changes up to r28366
Contains more changes needed to sync build system with latest FFmpeg.
Conflicts:
Makefile
configure
mplayer.c
Diffstat (limited to 'mpcommon.h')
| -rw-r--r-- | mpcommon.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mpcommon.h b/mpcommon.h index bdee63d898..a0c6fb8ff8 100644 --- a/mpcommon.h +++ b/mpcommon.h @@ -8,6 +8,8 @@ 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, 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); |