summaryrefslogtreecommitdiffstats
path: root/mplayer.c
diff options
context:
space:
mode:
authorarpi_esp <arpi_esp@b3059339-0415-0410-9bf9-f77b7e298cf2>2001-04-22 16:56:20 +0000
committerarpi_esp <arpi_esp@b3059339-0415-0410-9bf9-f77b7e298cf2>2001-04-22 16:56:20 +0000
commita1190e6ece548691d5eb288cbd4d16fa358bdabe (patch)
treeeeb6233626dc38d7377f236ae02fac84fc9659f5 /mplayer.c
parentf1288561ac629f32376e931084c07534b46eca66 (diff)
downloadmpv-a1190e6ece548691d5eb288cbd4d16fa358bdabe.tar.bz2
mpv-a1190e6ece548691d5eb288cbd4d16fa358bdabe.tar.xz
something moved to brand new stream.h
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@579 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'mplayer.c')
-rw-r--r--mplayer.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/mplayer.c b/mplayer.c
index 9c9f1ada16..d1bce11746 100644
--- a/mplayer.c
+++ b/mplayer.c
@@ -233,7 +233,7 @@ static int max_framesize=0;
// Input media streaming & demultiplexer:
//**************************************************************************//
-#include "stream.c"
+#include "stream.h"
#include "demuxer.c"
#include "stheader.h"
@@ -605,11 +605,13 @@ if(!parse_codec_cfg(get_path("codecs.conf"))){
if(vcd_track){
//============ Open VideoCD track ==============
+ int ret;
f=open(filename,O_RDONLY);
if(f<0){ printf("CD-ROM Device '%s' not found!\n",filename);return 1; }
vcd_read_toc(f);
- if(!vcd_seek_to_track(f,vcd_track)){ printf("Error selecting VCD track!\n");return 1;}
- seek_to_byte+=VCD_SECTOR_DATA*vcd_get_msf();
+ ret=vcd_seek_to_track(f,vcd_track);
+ if(ret==-1){ printf("Error selecting VCD track!\n");return 1;}
+ seek_to_byte+=ret;
if(verbose) printf("VCD start byte position: 0x%X\n",seek_to_byte);
stream_type=STREAMTYPE_VCD;
#ifdef VCD_CACHE