ref: 26ad437703a1edf92614ec44f3d7aa604c8e05b7
parent: ca4927a9acf69e35788e146201284609d9a86240
author: Gregory Maxwell <[email protected]>
date: Mon May 21 09:03:08 EDT 2012
Avoid confusion between int truncate and truncate();
--- a/src/opusdec.c
+++ b/src/opusdec.c
@@ -732,7 +732,7 @@
eos=1;
{- int truncate;
+ int trunc;
int ret;
/*Decode frame*/
if (!lost)
@@ -773,14 +773,14 @@
}
decoded += frame_size;
if (decoded > page_granule)
- truncate = decoded-page_granule;
+ trunc = decoded-page_granule;
else
- truncate = 0;
+ trunc = 0;
{int new_frame_size;
- if (truncate > frame_size)
- truncate = frame_size;
- new_frame_size = frame_size - truncate;
+ if (trunc > frame_size)
+ trunc = frame_size;
+ new_frame_size = frame_size - trunc;
audio_write(output, channels, new_frame_size, fout, resampler, &preskip, dither?&shapemem:0, strlen(outFile)==0);
audio_size+=sizeof(short)*new_frame_size*channels;
}