diff options
author | wm4 <wm4@nowhere> | 2013-07-14 17:59:26 +0200 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2013-07-14 17:59:26 +0200 |
commit | e18ffd6b998858ca0797cb0ce4aabd4a509655dd (patch) | |
tree | 199bddd30923db1175a1331191eb86ba684e9e41 /stream/vcd_read.h | |
parent | 3e7d483ac89289f613138002be2043ec5f479bb0 (diff) | |
parent | 5ead20bdb3328d199dad693039d18e7a05eb2465 (diff) | |
download | mpv-e18ffd6b998858ca0797cb0ce4aabd4a509655dd.tar.bz2 mpv-e18ffd6b998858ca0797cb0ce4aabd4a509655dd.tar.xz |
Merge branch 'remove_old_demuxers'
The merged branch doesn't actually just remove old demuxers, but also
includes a branch of cleanups and some refactoring.
Conflicts:
stream/stream.c
Diffstat (limited to 'stream/vcd_read.h')
-rw-r--r-- | stream/vcd_read.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/stream/vcd_read.h b/stream/vcd_read.h index 2d4a88604a..92a9c53b78 100644 --- a/stream/vcd_read.h +++ b/stream/vcd_read.h @@ -147,10 +147,12 @@ static mp_vcd_priv_t* vcd_read_toc(int fd){ return vcd; } +/* static int vcd_end_track(mp_vcd_priv_t* vcd) { return vcd->tochdr.cdth_trk1; } +*/ static int vcd_read(mp_vcd_priv_t* vcd,char *mem){ #ifndef sun |