diff options
| author | Tim Terriberry <tterribe@xiph.org> | 2010-08-31 19:10:31 +0000 |
|---|---|---|
| committer | Tim Terriberry <tterribe@xiph.org> | 2010-08-31 19:10:31 +0000 |
| commit | 8886a2805fc107489912f8c500db3373e04a316d (patch) | |
| tree | 42854e1ade8a2b627c52f2482bf27793054c0523 /info.c | |
| parent | 7125eb6381e57436db1c5a2d7c4e52091c37e95c (diff) | |
| download | tremor-8886a2805fc107489912f8c500db3373e04a316d.tar.gz | |
Convert Tremor to use libogg instead of its own internal libogg2.
This makes it easier to use Tremor as a drop-in replacement for libvorbis and
reduces code size and overhead for those who don't want to use its built-in
Ogg demuxer.
This commit also backports all of the changes that have accumulated in
libvorbis's vorbisfile implementation, with the exception of halfrate decoding
and cross-lapped seeking.
Those should not be too hard to add if someone really wants them.
git-svn-id: https://svn.xiph.org/trunk/Tremor@17375 0101bb08-14d6-0310-b084-bc0e0c8e3800
Diffstat (limited to 'info.c')
| -rw-r--r-- | info.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -21,7 +21,7 @@ #include <stdlib.h> #include <string.h> #include <ctype.h> -#include "ogg.h" +#include <ogg/ogg.h> #include "ivorbiscodec.h" #include "codec_internal.h" #include "codebook.h" @@ -299,7 +299,7 @@ int vorbis_synthesis_idheader(ogg_packet *op){ char buffer[6]; if(op){ - oggpack_readinit(&opb,op->packet); + oggpack_readinit(&opb,op->packet,op->bytes); if(!op->b_o_s) return(0); /* Not the initial packet */ @@ -327,7 +327,7 @@ int vorbis_synthesis_headerin(vorbis_info *vi,vorbis_comment *vc,ogg_packet *op) oggpack_buffer opb; if(op){ - oggpack_readinit(&opb,op->packet); + oggpack_readinit(&opb,op->packet,op->bytes); /* Which of the three types of header is this? */ /* Also verify header-ness, vorbis */ |