From 4f57ae39f6cb216fbf5fe55ae734a584a8466c4d Mon Sep 17 00:00:00 2001 From: Monty Date: Thu, 9 Apr 2009 16:03:25 +0000 Subject: [PATCH] Bugfix to new bisection code: fix end of data marker Still failing several chaining test vectors, DO NOT USE YET svn path=/trunk/vorbis/; revision=15929 --- lib/vorbisfile.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/lib/vorbisfile.c b/lib/vorbisfile.c index 5308696..4560ec5 100644 --- a/lib/vorbisfile.c +++ b/lib/vorbisfile.c @@ -219,8 +219,7 @@ static ogg_int64_t _get_prev_page_serial(OggVorbis_File *vf,int *serialno, ogg_i if(ret_serialno == *serialno){ prefoffset=ret; *granpos=ret_gran; - } - + } } } } @@ -626,7 +625,7 @@ static int _open_seekable2(OggVorbis_File *vf){ if(end<0)return(end); /* now determine bitstream structure recursively */ - if(_bisect_forward_serialno(vf,0,dataoffset,end+1,endgran,endserial, + if(_bisect_forward_serialno(vf,0,dataoffset,vf->offset,endgran,endserial, vf->serialnos+2,vf->serialnos[1],0)<0)return(OV_EREAD); vf->offsets[0]=0; -- 2.7.4