diff options
| author | Russell Bryant <russell@russellbryant.com> | 2011-05-03 20:45:32 +0000 |
|---|---|---|
| committer | Russell Bryant <russell@russellbryant.com> | 2011-05-03 20:45:32 +0000 |
| commit | 37aa52fd78996b5c516ff4c851b60252eda84b05 (patch) | |
| tree | e1651180838e594a0203f863f3cdd084860e1bf5 /main/file.c | |
| parent | 810b9c887949fc4bd9f01dcdc0d3a4f476cb00de (diff) | |
Merged revisions 316265 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8
........
r316265 | russell | 2011-05-03 14:55:49 -0500 (Tue, 03 May 2011) | 5 lines
Fix a bunch of compiler warnings generated by gcc 4.6.0.
Most of these are -Wunused-but-set-variable, but there were a few others
mixed in here, as well.
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@316293 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/file.c')
| -rw-r--r-- | main/file.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/main/file.c b/main/file.c index 57bf1570c..ffae33b5a 100644 --- a/main/file.c +++ b/main/file.c @@ -147,7 +147,6 @@ int ast_stopstream(struct ast_channel *tmp) int ast_writestream(struct ast_filestream *fs, struct ast_frame *f) { int res = -1; - int alt = 0; if (f->frametype == AST_FRAME_VIDEO) { if (AST_FORMAT_GET_TYPE(fs->fmt->format.id) == AST_FORMAT_TYPE_AUDIO) { /* This is the audio portion. Call the video one... */ @@ -160,9 +159,6 @@ int ast_writestream(struct ast_filestream *fs, struct ast_frame *f) return ast_writestream(fs->vfs, f); /* else ignore */ return 0; - } else { - /* Might / might not have mark set */ - alt = 1; } } else if (f->frametype != AST_FRAME_VOICE) { ast_log(LOG_WARNING, "Tried to write non-voice frame\n"); |