[asterisk-commits] trunk - r7820 in /trunk: ./ formats/format_pcm.c formats/format_pcm_alaw.c

[asterisk-commits at lists.digium.com]

Author: kpfleming
Date: Thu Jan  5 14:53:21 2006
New Revision: 7820

URL: http://svn.digium.com/view/asterisk?rev=7820&view=rev
Log:
Merged revisions 7819 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r7819 | kpfleming | 2006-01-05 14:52:38 -0600 (Thu, 05 Jan 2006) | 2 lines

ensure that variable is initialized

........

Modified:
    trunk/   (props changed)
    trunk/formats/format_pcm.c
    trunk/formats/format_pcm_alaw.c

Propchange: trunk/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Jan  5 14:53:21 2006
@@ -1,1 +1,1 @@
-/branches/1.2:1-7489,7491-7496,7498-7516,7518-7528,7530-7545,7547-7549,7551,7553-7556,7558-7579,7581-7585,7587-7594,7596-7604,7606-7640,7642-7662,7664-7705,7707-7737,7739-7770,7772-7791,7793-7809
+/branches/1.2:1-7489,7491-7496,7498-7516,7518-7528,7530-7545,7547-7549,7551,7553-7556,7558-7579,7581-7585,7587-7594,7596-7604,7606-7640,7642-7662,7664-7705,7707-7737,7739-7770,7772-7791,7793-7811,7813-7819

Modified: trunk/formats/format_pcm.c
URL: http://svn.digium.com/view/asterisk/trunk/formats/format_pcm.c?rev=7820&r1=7819&r2=7820&view=diff
==============================================================================
--- trunk/formats/format_pcm.c (original)
+++ trunk/formats/format_pcm.c Thu Jan  5 14:53:21 2006
@@ -176,7 +176,7 @@
 
 static int pcm_seek(struct ast_filestream *fs, long sample_offset, int whence)
 {
-	long cur, max, offset;
+	long cur, max, offset = 0;
 
 	cur = ftell(fs->f);
 	fseek(fs->f, 0, SEEK_END);

Modified: trunk/formats/format_pcm_alaw.c
URL: http://svn.digium.com/view/asterisk/trunk/formats/format_pcm_alaw.c?rev=7820&r1=7819&r2=7820&view=diff
==============================================================================
--- trunk/formats/format_pcm_alaw.c (original)
+++ trunk/formats/format_pcm_alaw.c Thu Jan  5 14:53:21 2006
@@ -251,7 +251,7 @@
 
 static int pcm_seek(struct ast_filestream *fs, long sample_offset, int whence)
 {
-	long cur, max, offset;
+	long cur, max, offset = 0;
 
 	cur = ftell(fs->f);
 	fseek(fs->f, 0, SEEK_END);