kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-19 16:20:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "core: Don't stop generators when writing RTCP frames." into 16

Browse Source
This commit is contained in:
Jenkins2
2018-09-07 07:02:24 -05:00
committed by Gerrit Code Review
parent 3c52cc32f1 af6a3d02e1
commit c1a2c84361
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
main/channel.c
View File

@@ -5029,7 +5029,7 @@ int ast_write_stream(struct ast_channel *chan, int stream_num, struct ast_frame
goto done; goto done;
} }
if (ast_channel_generatordata(chan) && (!fr->src || strcasecmp(fr->src, "ast_prod"))) { if (ast_channel_generatordata(chan) && (fr->frametype != AST_FRAME_RTCP) && (!fr->src || strcasecmp(fr->src, "ast_prod"))) {
if (ast_test_flag(ast_channel_flags(chan), AST_FLAG_WRITE_INT)) { if (ast_test_flag(ast_channel_flags(chan), AST_FLAG_WRITE_INT)) {
ast_deactivate_generator(chan); ast_deactivate_generator(chan);
} else { } else {