diff options
author | seanbright <seanbright@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-08-07 15:16:48 +0000 |
---|---|---|
committer | seanbright <seanbright@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-08-07 15:16:48 +0000 |
commit | f21f6ae82a790d6e0ad53bd7eef20842bd443218 (patch) | |
tree | 76635e989b9cee45e1c0376675b4149a86bfe53e /utils/frame.c | |
parent | 777979c9d9280bfd9526345a1b326ad46b1b45fb (diff) |
More merges from resolve-shadow warnings:
utils/
codecs/
and a change I missed from formats/
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@136408 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'utils/frame.c')
-rw-r--r-- | utils/frame.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/utils/frame.c b/utils/frame.c index 5aadb9687..33a04808f 100644 --- a/utils/frame.c +++ b/utils/frame.c @@ -1008,7 +1008,7 @@ double double2db( double value) return 6.0 * log( value / 32767) / log( 2); } -void readawaysamples( FILE *in, size_t size) +void readawaysamples( FILE *input, size_t size) { short *buffer; int samplesread, count; @@ -1023,8 +1023,8 @@ void readawaysamples( FILE *in, size_t size) else count = size; - samplesread = fread( buffer, sizeof(*buffer), count, in); - if (ferror( in) != 0) + samplesread = fread( buffer, sizeof(*buffer), count, input); + if (ferror( input) != 0) fatalperror("Error reading input file"); size -= samplesread; } |