diff options
| author | faust3 <faust3@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2005-08-18 16:25:45 +0000 |
|---|---|---|
| committer | faust3 <faust3@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2005-08-18 16:25:45 +0000 |
| commit | adbb6416694c4501ccb63d43640bcb0f5e5ce686 (patch) | |
| tree | bf57c65faf6dc36bfe66e32603aa1f75d30fe9f1 /tremor | |
| parent | 37b27a0c86157c32681f5cb1c84062f14af9b774 (diff) | |
| download | mpv-adbb6416694c4501ccb63d43640bcb0f5e5ce686.tar.bz2 mpv-adbb6416694c4501ccb63d43640bcb0f5e5ce686.tar.xz | |
fix warnings and decoding on CYGWIN (produced only noise before this change)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16267 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'tremor')
| -rw-r--r-- | tremor/sharedbook.c | 4 | ||||
| -rw-r--r-- | tremor/tremor.diff | 25 |
2 files changed, 27 insertions, 2 deletions
diff --git a/tremor/sharedbook.c b/tremor/sharedbook.c index a8d411e2c2..afc83e7386 100644 --- a/tremor/sharedbook.c +++ b/tremor/sharedbook.c @@ -208,7 +208,7 @@ ogg_int32_t *_book_unquantize(const static_codebook *b,int n,int *sparsemap, 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 @@ ogg_int32_t *_book_unquantize(const static_codebook *b,int n,int *sparsemap, 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); diff --git a/tremor/tremor.diff b/tremor/tremor.diff index 818e902609..560420b9fc 100644 --- a/tremor/tremor.diff +++ b/tremor/tremor.diff @@ -89,3 +89,28 @@ diff -ur orig/os_types.h mod-2004-01-05/os_types.h + 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); + |