diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2008-10-28 04:12:18 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2008-10-28 04:12:18 +0200 |
| commit | 479f5e742f22d46430fa265adfa9162f4e2ab865 (patch) | |
| tree | 8450cfd34feb5b81d604101ad9ebfc7b24c1d88e /vobsub.h | |
| parent | 0d7f9f033cdd677df3b85aca45491955b87a1abc (diff) | |
| parent | 97293969b40797442ec0f612b89a89ace8804561 (diff) | |
| download | mpv-479f5e742f22d46430fa265adfa9162f4e2ab865.tar.bz2 mpv-479f5e742f22d46430fa265adfa9162f4e2ab865.tar.xz | |
Merge svn changes up to r27841
Conflicts:
mplayer.c
Diffstat (limited to 'vobsub.h')
| -rw-r--r-- | vobsub.h | 1 |
1 files changed, 0 insertions, 1 deletions
@@ -24,7 +24,6 @@ extern void *vobsub_out_open(const char *basename, const unsigned int *palette, extern void vobsub_out_output(void *me, const unsigned char *packet, int len, double pts); extern void vobsub_out_close(void *me); extern int vobsub_set_from_lang(void *vobhandle, unsigned char * lang); -extern unsigned int vobsub_get_forced_subs_flag(void const * const vobhandle); extern void vobsub_seek(void * vobhandle, float pts); #endif /* MPLAYER_VOBSUB_H */ |