diff options
| author | Dave Hooper <dave@beermex.com> | 2010-02-17 00:49:53 +0000 |
|---|---|---|
| committer | Dave Hooper <dave@beermex.com> | 2010-02-17 00:49:53 +0000 |
| commit | 42774d3128b91d5a37344cb40d56d3c4d147e5f2 (patch) | |
| tree | bf336b407992ec9a5e454556f3351e3f8a0d10de /apps/codecs/libtremor/info.c | |
| parent | 62257ebc38bc0a3095b25dd0f58c4c8215edf602 (diff) | |
| download | rockbox-42774d3128b91d5a37344cb40d56d3c4d147e5f2.tar.gz rockbox-42774d3128b91d5a37344cb40d56d3c4d147e5f2.zip | |
Merge from branches/mdctexp - faster ifft+imdct in codec lib
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24712 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/codecs/libtremor/info.c')
| -rw-r--r-- | apps/codecs/libtremor/info.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/apps/codecs/libtremor/info.c b/apps/codecs/libtremor/info.c index 4273f97dc1..afa9497cf0 100644 --- a/apps/codecs/libtremor/info.c +++ b/apps/codecs/libtremor/info.c | |||
| @@ -120,8 +120,10 @@ static int _vorbis_unpack_info(vorbis_info *vi,oggpack_buffer *opb){ | |||
| 120 | vi->bitrate_nominal=oggpack_read(opb,32); | 120 | vi->bitrate_nominal=oggpack_read(opb,32); |
| 121 | vi->bitrate_lower=oggpack_read(opb,32); | 121 | vi->bitrate_lower=oggpack_read(opb,32); |
| 122 | 122 | ||
| 123 | ci->blocksizes[0]=1<<oggpack_read(opb,4); | 123 | ci->blocksizes_nbits[0]=oggpack_read(opb,4); |
| 124 | ci->blocksizes[1]=1<<oggpack_read(opb,4); | 124 | ci->blocksizes_nbits[1]=oggpack_read(opb,4); |
| 125 | ci->blocksizes[0]=1<<(ci->blocksizes_nbits[0]); | ||
| 126 | ci->blocksizes[1]=1<<(ci->blocksizes_nbits[1]); | ||
| 125 | 127 | ||
| 126 | if(vi->rate<1)goto err_out; | 128 | if(vi->rate<1)goto err_out; |
| 127 | if(vi->channels<1)goto err_out; | 129 | if(vi->channels<1)goto err_out; |