summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2010-02-22 16:32:03 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2010-02-22 16:32:03 +0000
commit202fbbecdfd6983d6133eb07567eb82852244ba9 (patch)
tree019adf57508cd88900606f6d66bd5bf257d1ce84
parent6676504bbe3ba356585bfc64ee1624ddbecb37ee (diff)
downloadmpv-202fbbecdfd6983d6133eb07567eb82852244ba9.tar.bz2
mpv-202fbbecdfd6983d6133eb07567eb82852244ba9.tar.xz
Mark vcd_get_track_end () and vcd_read_toc() as static.
They are only used within the respective files. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30712 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r--stream/vcd_read.h4
-rw-r--r--stream/vcd_read_darwin.h4
-rw-r--r--stream/vcd_read_fbsd.h4
-rw-r--r--stream/vcd_read_win32.h4
4 files changed, 8 insertions, 8 deletions
diff --git a/stream/vcd_read.h b/stream/vcd_read.h
index 2f60d518ad..2911186d20 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;
diff --git a/stream/vcd_read_darwin.h b/stream/vcd_read_darwin.h
index 4d4a0334ba..20f1782049 100644
--- a/stream/vcd_read_darwin.h
+++ b/stream/vcd_read_darwin.h
@@ -86,7 +86,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)
{
struct CDTrackInfo entry;
@@ -117,7 +117,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)
{
dk_cd_read_disc_info_t tochdr;
struct CDDiscInfo hdr;
diff --git a/stream/vcd_read_fbsd.h b/stream/vcd_read_fbsd.h
index e60590e1f5..a9555f5b9e 100644
--- a/stream/vcd_read_fbsd.h
+++ b/stream/vcd_read_fbsd.h
@@ -144,7 +144,7 @@ vcd_seek_to_track(mp_vcd_priv_t* vcd, int track)
return VCD_SECTOR_DATA * vcd_get_msf(vcd);
}
-int
+static int
vcd_get_track_end(mp_vcd_priv_t* vcd, int track)
{
if (!read_toc_entry(vcd,
@@ -153,7 +153,7 @@ vcd_get_track_end(mp_vcd_priv_t* vcd, int track)
return VCD_SECTOR_DATA * vcd_get_msf(vcd);
}
-mp_vcd_priv_t*
+static mp_vcd_priv_t*
vcd_read_toc(int fd)
{
struct ioc_toc_header tochdr;
diff --git a/stream/vcd_read_win32.h b/stream/vcd_read_win32.h
index f0b7bd45ef..3b93a76b0a 100644
--- a/stream/vcd_read_win32.h
+++ b/stream/vcd_read_win32.h
@@ -63,14 +63,14 @@ int vcd_seek_to_track(mp_vcd_priv_t* vcd, int track)
return VCD_SECTOR_DATA * (sect + 2);
}
-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)
{
if (track < vcd->toc.FirstTrack || track > vcd->toc.LastTrack)
return -1;
return VCD_SECTOR_DATA * (vcd_get_msf(vcd, track + 1));
}
-mp_vcd_priv_t* vcd_read_toc(int fd)
+static mp_vcd_priv_t* vcd_read_toc(int fd)
{
DWORD dwBytesReturned;
HANDLE hd;