[asterisk-commits] mnicholson: branch 1.6.1 r158926 - in /branches/1.6.1: ./ main/file.c

[SVN commits to the Asterisk project]

Author: mnicholson
Date: Mon Nov 24 18:26:06 2008
New Revision: 158926

URL: http://svn.digium.com/view/asterisk?view=rev&rev=158926
Log:
Merged revisions 158925 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
  r158925 | mnicholson | 2008-11-24 18:19:55 -0600 (Mon, 24 Nov 2008) | 2 lines
  
  Fix compiling in dev mode.
........

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/main/file.c

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.1/main/file.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.1/main/file.c?view=diff&rev=158926&r1=158925&r2=158926
==============================================================================
--- branches/1.6.1/main/file.c (original)
+++ branches/1.6.1/main/file.c Mon Nov 24 18:26:06 2008
@@ -898,6 +898,7 @@
 	struct ast_filestream *vfs=NULL;
 	char fmt[256];
 	int seekattempt;
+	int res;
 
 	fs = ast_openstream(chan, filename, preflang);
 	if (!fs) {
@@ -919,7 +920,6 @@
 		ast_debug(1, "Ooh, found a video stream, too, format %s\n", ast_getformatname(vfs->fmt->format));
 	}
 
-	int res;
 	if (ast_test_flag(chan, AST_FLAG_MASQ_NOSTREAM))
 		fs->orig_chan_name = ast_strdup(chan->name);
 	if (ast_applystream(chan, fs))