diff options
author | Nils Wallménius <nils@rockbox.org> | 2010-12-08 17:28:17 +0000 |
---|---|---|
committer | Nils Wallménius <nils@rockbox.org> | 2010-12-08 17:28:17 +0000 |
commit | 2aa511f6bdac6364fe09a0004e4e14b3fc17a6c2 (patch) | |
tree | 7c9bad037e3f57f7138d3846ccdccc48a752cd80 /apps/codecs/libtremor/vorbisfile.c | |
parent | aff90a9db734186e680c4ef747d66d32a83eb2aa (diff) | |
download | rockbox-2aa511f6bdac6364fe09a0004e4e14b3fc17a6c2.tar.gz rockbox-2aa511f6bdac6364fe09a0004e4e14b3fc17a6c2.zip |
libtremor: merge upstream revisions 17541, 17542, 17543, 17544, 17545, 17546, 17547, 17555, 17572, bringing in various fixes and finally bringing our libtremor up to date, for now.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@28773 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/codecs/libtremor/vorbisfile.c')
-rw-r--r-- | apps/codecs/libtremor/vorbisfile.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/apps/codecs/libtremor/vorbisfile.c b/apps/codecs/libtremor/vorbisfile.c index f0a83364ec..5721178b67 100644 --- a/apps/codecs/libtremor/vorbisfile.c +++ b/apps/codecs/libtremor/vorbisfile.c | |||
@@ -902,7 +902,7 @@ static int _ov_open1(void *f,OggVorbis_File *vf,const char *initial, | |||
902 | for second stage of seekable stream open; this saves having to | 902 | for second stage of seekable stream open; this saves having to |
903 | seek/reread first link's serialnumber data then. */ | 903 | seek/reread first link's serialnumber data then. */ |
904 | vf->serialnos=_ogg_calloc(serialno_list_size+2,sizeof(*vf->serialnos)); | 904 | vf->serialnos=_ogg_calloc(serialno_list_size+2,sizeof(*vf->serialnos)); |
905 | vf->serialnos[0]=vf->current_serialno; | 905 | vf->serialnos[0]=vf->current_serialno=vf->os.serialno; |
906 | vf->serialnos[1]=serialno_list_size; | 906 | vf->serialnos[1]=serialno_list_size; |
907 | memcpy(vf->serialnos+2,serialno_list,serialno_list_size*sizeof(*vf->serialnos)); | 907 | memcpy(vf->serialnos+2,serialno_list,serialno_list_size*sizeof(*vf->serialnos)); |
908 | 908 | ||
@@ -910,7 +910,6 @@ static int _ov_open1(void *f,OggVorbis_File *vf,const char *initial, | |||
910 | vf->dataoffsets=_ogg_calloc(1,sizeof(*vf->dataoffsets)); | 910 | vf->dataoffsets=_ogg_calloc(1,sizeof(*vf->dataoffsets)); |
911 | vf->offsets[0]=0; | 911 | vf->offsets[0]=0; |
912 | vf->dataoffsets[0]=vf->offset; | 912 | vf->dataoffsets[0]=vf->offset; |
913 | vf->current_serialno=vf->os.serialno; | ||
914 | 913 | ||
915 | vf->ready_state=PARTOPEN; | 914 | vf->ready_state=PARTOPEN; |
916 | } | 915 | } |