Fix signed overflow in _book_maptype1_quantvals().

[platform/upstream/libvorbis.git] / lib / envelope.h

diff --git a/lib/envelope.h b/lib/envelope.h
index 6337ae6..50c7ca9 100644 (file)
--- a/lib/envelope.h
+++ b/lib/envelope.h
@@ -5,13 +5,13 @@
  * GOVERNED BY A BSD-STYLE SOURCE LICENSE INCLUDED WITH THIS SOURCE *
  * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.       *
  *                                                                  *
- * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
- * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2009             *
+ * by the Xiph.Org Foundation http://www.xiph.org/                  *
  *                                                                  *
  ********************************************************************
 
  function: PCM data envelope analysis and manipulation
- last mod: $Id: envelope.h,v 1.23 2002/03/30 01:56:58 xiphmont Exp $
+ last mod: $Id$
 
  ********************************************************************/
 
@@ -29,7 +29,7 @@
 #define VE_NEARDC 15
 
 #define VE_MINSTRETCH 2   /* a bit less than short block */
-#define VE_MAXSTRETCH 31  /* one full block */
+#define VE_MAXSTRETCH 12  /* one-third full block */
 
 typedef struct {
   float ampbuf[VE_AMP];
@@ -40,7 +40,6 @@ typedef struct {
   float nearDC_partialacc;
   int   nearptr;
 
-  float markers[1024];
 } envelope_filter_state;
 
 typedef struct {
@@ -79,4 +78,3 @@ extern int  _ve_envelope_mark(vorbis_dsp_state *v);
 
 
 #endif
-