diff options
| author | mnicholson <mnicholson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-11-25 00:26:06 +0000 |
|---|---|---|
| committer | mnicholson <mnicholson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-11-25 00:26:06 +0000 |
| commit | 72ba318790f62367abfab9a2532ba4a279a6ae14 (patch) | |
| tree | 9a6a9859304c1a16828a00f08ed46f759ade3ad5 /main/file.c | |
| parent | c42b15c8695fc39017c1d23d60d85092745a9175 (diff) | |
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: http://svn.digium.com/svn/asterisk/branches/1.6.1@158926 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/file.c')
| -rw-r--r-- | main/file.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/main/file.c b/main/file.c index 79c5c1bf2..61d45fe1c 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)) |