Mercurial > mplayer.hg

changeset 16266:c820ccd4f5eb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix warnings and decoding on CYGWIN (produced only noise before this change)
author faust3
date Thu, 18 Aug 2005 16:25:45 +0000
parents f0bd9bc9647b
children c2e581684e17
files tremor/sharedbook.c tremor/tremor.diff
diffstat 2 files changed, 27 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/tremor/sharedbook.c	Thu Aug 18 13:46:01 2005 +0000
+++ b/tremor/sharedbook.c	Thu Aug 18 16:25:45 2005 +0000
@@ -208,7 +208,7 @@
 	  int indexdiv=1;
 	  for(k=0;k<b->dim;k++){
 	    int index= (j/indexdiv)%quantvals;
-	    int point;
+	    ogg_int32_t point;
 	    int val=VFLOAT_MULTI(delta,delpoint,
 				 abs(b->quantlist[index]),&point);
 
@@ -242,7 +242,7 @@
 	  int         lastpoint=0;
 
 	  for(k=0;k<b->dim;k++){
-	    int point;
+	    ogg_int32_t point;
 	    int val=VFLOAT_MULTI(delta,delpoint,
 				 abs(b->quantlist[j*b->dim+k]),&point);
 
--- a/tremor/tremor.diff	Thu Aug 18 13:46:01 2005 +0000
+++ b/tremor/tremor.diff	Thu Aug 18 16:25:45 2005 +0000
@@ -89,3 +89,28 @@
 +   typedef int16_t ogg_int16_t;
  
  #endif  /* _OS_TYPES_H */
+Index: sharedbook.c
+===================================================================
+RCS file: /cvsroot/mplayer/main/tremor/sharedbook.c,v
+retrieving revision 1.1
+diff -u -r1.1 sharedbook.c
+--- sharedbook.c	30 Dec 2004 12:09:20 -0000	1.1
++++ sharedbook.c	18 Aug 2005 16:13:54 -0000
+@@ -208,7 +208,7 @@
+ 	  int indexdiv=1;
+ 	  for(k=0;k<b->dim;k++){
+ 	    int index= (j/indexdiv)%quantvals;
+-	    int point;
++	    ogg_int32_t point;
+ 	    int val=VFLOAT_MULTI(delta,delpoint,
+ 				 abs(b->quantlist[index]),&point);
+ 
+@@ -242,7 +242,7 @@
+ 	  int         lastpoint=0;
+ 
+ 	  for(k=0;k<b->dim;k++){
+-	    int point;
++	    ogg_int32_t point;
+ 	    int val=VFLOAT_MULTI(delta,delpoint,
+ 				 abs(b->quantlist[j*b->dim+k]),&point);
+