From 37aa52fd78996b5c516ff4c851b60252eda84b05 Mon Sep 17 00:00:00 2001 From: Russell Bryant Date: Tue, 3 May 2011 20:45:32 +0000 Subject: Merged revisions 316265 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.8 ........ r316265 | russell | 2011-05-03 14:55:49 -0500 (Tue, 03 May 2011) | 5 lines Fix a bunch of compiler warnings generated by gcc 4.6.0. Most of these are -Wunused-but-set-variable, but there were a few others mixed in here, as well. ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@316293 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- formats/format_wav.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'formats') diff --git a/formats/format_wav.c b/formats/format_wav.c index fa8d5766d..5ea4fab41 100644 --- a/formats/format_wav.c +++ b/formats/format_wav.c @@ -355,7 +355,6 @@ static struct ast_frame *wav_read(struct ast_filestream *s, int *whennext) #if __BYTE_ORDER == __BIG_ENDIAN int x; #endif - short *tmp; int bytes; off_t here; /* Send a frame from the file to the appropriate channel */ @@ -382,8 +381,8 @@ static struct ast_frame *wav_read(struct ast_filestream *s, int *whennext) s->fr.datalen = res; s->fr.samples = samples = res / 2; - tmp = (short *)(s->fr.data.ptr); #if __BYTE_ORDER == __BIG_ENDIAN + tmp = (short *)(s->fr.data.ptr); /* file format is little endian so we need to swap */ for( x = 0; x < samples; x++) tmp[x] = (tmp[x] << 8) | ((tmp[x] & 0xff00) >> 8); -- cgit v1.2.3