diff options
Diffstat (limited to 'main')
| -rw-r--r-- | main/bridge.c | 7 | ||||
| -rw-r--r-- | main/rtp_engine.c | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/main/bridge.c b/main/bridge.c index 3a358d9f8..a1a1a6f55 100644 --- a/main/bridge.c +++ b/main/bridge.c @@ -3816,6 +3816,13 @@ void ast_bridge_set_sfu_video_mode(struct ast_bridge *bridge) ast_bridge_unlock(bridge); } +void ast_bridge_set_video_update_discard(struct ast_bridge *bridge, unsigned int video_update_discard) +{ + ast_bridge_lock(bridge); + bridge->softmix.video_mode.video_update_discard = video_update_discard; + ast_bridge_unlock(bridge); +} + void ast_bridge_update_talker_src_video_mode(struct ast_bridge *bridge, struct ast_channel *chan, int talker_energy, int is_keyframe) { struct ast_bridge_video_talker_src_data *data; diff --git a/main/rtp_engine.c b/main/rtp_engine.c index fe60c4eae..e078b2400 100644 --- a/main/rtp_engine.c +++ b/main/rtp_engine.c @@ -3386,7 +3386,7 @@ int ast_rtp_instance_bundle(struct ast_rtp_instance *child, struct ast_rtp_insta { int res = -1; - if (child->engine != parent->engine) { + if (parent && (child->engine != parent->engine)) { return -1; } |