diff options
author | Nils Wallménius <nils@rockbox.org> | 2010-12-06 14:36:52 +0000 |
---|---|---|
committer | Nils Wallménius <nils@rockbox.org> | 2010-12-06 14:36:52 +0000 |
commit | 67efbc13870ee87ce3df442f7c396c13481921ec (patch) | |
tree | eaf63d36c5bf2d41a6b3bb2addecb4d3c05f7eef /apps/codecs/libtremor/info.c | |
parent | 1f64b7fb1fa5058e3b7871078055156eac0c511d (diff) | |
download | rockbox-67efbc13870ee87ce3df442f7c396c13481921ec.tar.gz rockbox-67efbc13870ee87ce3df442f7c396c13481921ec.zip |
libtremor:
Merge in upstream revision 17375.
This removes tremor's internal ogg code and now uses libogg instead so a bunch of changes are just adjusting to the new api. Also brings in improvements to vorbisfile which fixes FS#10484.
Disabled a lot of unused code in the libogg files and moved some small functions into the ogg.h header so they can be inlined. Some small tweaks to fix warnings.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@28742 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/codecs/libtremor/info.c')
-rw-r--r-- | apps/codecs/libtremor/info.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/codecs/libtremor/info.c b/apps/codecs/libtremor/info.c index 9bfa7d03b0..f3ac5f87f6 100644 --- a/apps/codecs/libtremor/info.c +++ b/apps/codecs/libtremor/info.c | |||
@@ -240,7 +240,7 @@ int vorbis_synthesis_idheader(ogg_packet *op){ | |||
240 | char buffer[6]; | 240 | char buffer[6]; |
241 | 241 | ||
242 | if(op){ | 242 | if(op){ |
243 | oggpack_readinit(&opb,op->packet); | 243 | oggpack_readinit(&opb,op->packet,op->bytes); |
244 | 244 | ||
245 | if(!op->b_o_s) | 245 | if(!op->b_o_s) |
246 | return(0); /* Not the initial packet */ | 246 | return(0); /* Not the initial packet */ |
@@ -268,7 +268,7 @@ int vorbis_synthesis_headerin(vorbis_info *vi,vorbis_comment *vc,ogg_packet *op) | |||
268 | oggpack_buffer opb; | 268 | oggpack_buffer opb; |
269 | 269 | ||
270 | if(op){ | 270 | if(op){ |
271 | oggpack_readinit(&opb,op->packet); | 271 | oggpack_readinit(&opb,op->packet,op->bytes); |
272 | 272 | ||
273 | /* Which of the three types of header is this? */ | 273 | /* Which of the three types of header is this? */ |
274 | /* Also verify header-ness, vorbis */ | 274 | /* Also verify header-ness, vorbis */ |