diff options
author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-03-10 01:25:15 +0200 |
---|---|---|
committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-03-10 01:25:15 +0200 |
commit | acdce0176ae3722ad38a23aae0cf0bf03a82f9c4 (patch) | |
tree | 57a30f1d44ea193586d5723faac7ffb96a3a73aa /stream/vcd_read.h | |
parent | ef3ef5e218588b5f68b427729a3c2c1a8083e499 (diff) | |
parent | 5a2289137f43501281dba83fe98b5f67be63f9ef (diff) | |
download | mpv-acdce0176ae3722ad38a23aae0cf0bf03a82f9c4.tar.bz2 mpv-acdce0176ae3722ad38a23aae0cf0bf03a82f9c4.tar.xz |
Merge svn changes up to r30732
Diffstat (limited to 'stream/vcd_read.h')
-rw-r--r-- | stream/vcd_read.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/stream/vcd_read.h b/stream/vcd_read.h index ae34d1cf21..f94c7ea297 100644 --- a/stream/vcd_read.h +++ b/stream/vcd_read.h @@ -72,7 +72,7 @@ int vcd_seek_to_track(mp_vcd_priv_t* vcd,int track){ return VCD_SECTOR_DATA*vcd_get_msf(vcd); } -int vcd_get_track_end(mp_vcd_priv_t* vcd,int track){ +static int vcd_get_track_end(mp_vcd_priv_t* vcd,int track){ vcd->entry.cdte_format = CDROM_MSF; vcd->entry.cdte_track = track<vcd->tochdr.cdth_trk1?(track+1):CDROM_LEADOUT; if (ioctl(vcd->fd, CDROMREADTOCENTRY, &vcd->entry)) { @@ -82,7 +82,7 @@ int vcd_get_track_end(mp_vcd_priv_t* vcd,int track){ return VCD_SECTOR_DATA*vcd_get_msf(vcd); } -mp_vcd_priv_t* vcd_read_toc(int fd){ +static mp_vcd_priv_t* vcd_read_toc(int fd){ struct cdrom_tochdr tochdr; mp_vcd_priv_t* vcd; int i, min = 0, sec = 0, frame = 0; |