diff options
| author | Joshua Colp <jcolp@digium.com> | 2017-07-26 08:31:13 -0500 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2017-07-26 08:31:13 -0500 |
| commit | b610295b62abfdcac068b2fe1406ba74df8a00b5 (patch) | |
| tree | b9e3101f829ba692d9bac4376e8a4d523c6c9410 /main/rtp_engine.c | |
| parent | 7ea6c66968146a79869ca6813818be1c6728183d (diff) | |
| parent | 680c491a6238274132bff3608ae17b1371c2af2a (diff) | |
Merge "bridge_softmix / res_rtp_asterisk: Fix packet loss and renegotiation issues."
Diffstat (limited to 'main/rtp_engine.c')
| -rw-r--r-- | main/rtp_engine.c | 2 |
1 files changed, 1 insertions, 1 deletions
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; } |