diff options
| author | Ron <ron@debian.org> | 2011-02-03 22:14:15 +0300 |
|---|---|---|
| committer | Jean-Marc Valin <jean-marc.valin@usherbrooke.ca> | 2011-02-03 22:23:49 +0300 |
| commit | c33c3d6ce59e0c51db98048161e65cc165c9565b (patch) | |
| tree | 702114fbf9d2b1ba32d9088dafe6a35faf8ba923 /tools/celtenc.c | |
| parent | d539c6b9c59d243f81a47d78b9497ea455bdea00 (diff) | |
Align the sample buffer for short
Diffstat (limited to 'tools/celtenc.c')
| -rw-r--r-- | tools/celtenc.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/tools/celtenc.c b/tools/celtenc.c index c07ed74..d6e0138 100644 --- a/tools/celtenc.c +++ b/tools/celtenc.c @@ -92,9 +92,9 @@ int oe_write_page(ogg_page *page, FILE *fp) /* Convert input audio bits, endians and channels */ static int read_samples(FILE *fin,int frame_size, int bits, int channels, int lsb, short * input, char *buff, celt_int32 *size) { - unsigned char in[MAX_FRAME_SIZE*2]; + short s[MAX_FRAME_SIZE]; + unsigned char *in = (unsigned char*)s; int i; - short *s; int nb_read; if (size && *size<=0) @@ -120,7 +120,6 @@ static int read_samples(FILE *fin,int frame_size, int bits, int channels, int ls if (nb_read==0) return 0; - s=(short*)in; if(bits==8) { /* Convert 8->16 bits */ @@ -144,7 +143,7 @@ static int read_samples(FILE *fin,int frame_size, int bits, int channels, int ls /* copy to float input buffer */ for (i=0;i<frame_size*channels;i++) { - input[i]=(short)s[i]; + input[i]=s[i]; } for (i=nb_read*channels;i<frame_size*channels;i++) |