Merge "core: Don't stop generators when writing RTCP frames." into 16
This commit is contained in:
commit
c1a2c84361
|
@ -5029,7 +5029,7 @@ int ast_write_stream(struct ast_channel *chan, int stream_num, struct ast_frame
|
|||
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)) {
|
||||
ast_deactivate_generator(chan);
|
||||
} else {
|
||||
|
|
Loading…
Reference in New Issue