aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2010-07-09 11:01:06 -0700
committerThe Android Open Source Project <initial-contribution@android.com>2010-07-09 11:01:10 -0700
commitef03ae17fcbd7474f839cc2fee27a58369cf41dd (patch)
tree8df8c4853c447283df0a6781c0e01112addafa67
parent845097c460f780f65c63b4e3e5ec3de03f23bc66 (diff)
parentac1571fdc91e2e215e86c4069e328d3294682e23 (diff)
downloadexternal_tremolo-ef03ae17fcbd7474f839cc2fee27a58369cf41dd.zip
external_tremolo-ef03ae17fcbd7474f839cc2fee27a58369cf41dd.tar.gz
external_tremolo-ef03ae17fcbd7474f839cc2fee27a58369cf41dd.tar.bz2
merge from open-source master
Change-Id: Iea0b0b45f13a3f1d045ed36d475dba5bbed71874
-rw-r--r--Tremolo/bitwise.c2
-rw-r--r--Tremolo/os_types.h1
2 files changed, 2 insertions, 1 deletions
diff --git a/Tremolo/bitwise.c b/Tremolo/bitwise.c
index 3f1be7a..2182641 100644
--- a/Tremolo/bitwise.c
+++ b/Tremolo/bitwise.c
@@ -214,7 +214,7 @@ void oggpack_readinit(oggpack_buffer *b,ogg_reference *r){
/* Read in bits without advancing the bitptr; bits <= 32 */
long oggpack_look(oggpack_buffer *b,int bits){
unsigned long m=mask[bits];
- unsigned long ret;
+ unsigned long ret = 0;
int BITS = bits;
bits+=b->headbit;
diff --git a/Tremolo/os_types.h b/Tremolo/os_types.h
index b08d0ce..315227c 100644
--- a/Tremolo/os_types.h
+++ b/Tremolo/os_types.h
@@ -117,6 +117,7 @@
# include <sys/types.h>
# include "config_types.h"
+# include <endian.h>
#endif