diff options
| author | pcadach <pcadach@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-09-28 11:12:58 +0000 |
|---|---|---|
| committer | pcadach <pcadach@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-09-28 11:12:58 +0000 |
| commit | d376634d0f8160d2a43a06d67a26f721adaf5530 (patch) | |
| tree | 38b7f6cea9e73b4f59b365fe39b310007b8078ca /main | |
| parent | 4ac9afef329d9525cda5dd82a8af1e4af0b054bf (diff) | |
Merged revisions 43635,43843-43844,43846 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r43635 | pcadach | 2006-09-26 03:26:12 +0600 (Втр, 26 Сен 2006) | 1 line
Fix ASN1 description of non-standard Cisco extensions
........
r43843 | pcadach | 2006-09-28 12:01:37 +0600 (Чтв, 28 Сен 2006) | 1 line
Don't treat unknown control frames as voice
........
r43844 | pcadach | 2006-09-28 12:02:45 +0600 (Чтв, 28 Сен 2006) | 1 line
Don't warn on HOLD/UNHOLD control frames
........
r43846 | pcadach | 2006-09-28 16:51:21 +0600 (Чтв, 28 Сен 2006) | 1 line
Do not open transmit channel until TCS is received
........
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@43853 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main')
| -rw-r--r-- | main/file.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/main/file.c b/main/file.c index 766c38ab0..f8ca9afeb 100644 --- a/main/file.c +++ b/main/file.c @@ -1056,11 +1056,14 @@ static int waitstream_core(struct ast_channel *c, const char *breakon, case AST_CONTROL_RINGING: case AST_CONTROL_ANSWER: case AST_CONTROL_VIDUPDATE: + case AST_CONTROL_HOLD: + case AST_CONTROL_UNHOLD: /* Unimportant */ break; default: ast_log(LOG_WARNING, "Unexpected control subclass '%d'\n", fr->subclass); } + break; case AST_FRAME_VOICE: /* Write audio if appropriate */ if (audiofd > -1) |