From ef6ffe6ee39fe4c2702d02a9d149481916d231db Mon Sep 17 00:00:00 2001 From: Matthew Nicholson Date: Tue, 25 Nov 2008 00:26:06 +0000 Subject: [PATCH] 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. ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@158926 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- main/file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main/file.c b/main/file.c index 79c5c1bf29..61d45fe1c5 100644 --- a/main/file.c +++ b/main/file.c @@ -898,6 +898,7 @@ int ast_streamfile(struct ast_channel *chan, const char *filename, const char *p struct ast_filestream *vfs=NULL; char fmt[256]; int seekattempt; + int res; fs = ast_openstream(chan, filename, preflang); if (!fs) { @@ -919,7 +920,6 @@ int ast_streamfile(struct ast_channel *chan, const char *filename, const char *p 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))