summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoshua Colp <jcolp@digium.com>2015-07-02 07:52:29 -0500
committerGerrit Code Review <gerrit2@gerrit.digium.api>2015-07-02 07:52:29 -0500
commit43926568c3c6de6a53667ea0f9625eb8ecab2d02 (patch)
tree7df415935c0486e6e52ea0f578ba77e73830d50e
parentc2f4bf142fdf132ac82a523e7c5f0c4397eb0932 (diff)
parentb835312b4c2e1fcd3f7efb5ae45a0c4d10d4d5f7 (diff)
Merge "rtp_engine: Skip useless self-assignment in ast_rtp_engine_unload_format." into 13
-rw-r--r--main/rtp_engine.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/main/rtp_engine.c b/main/rtp_engine.c
index e09dcb88c..2d61c89b6 100644
--- a/main/rtp_engine.c
+++ b/main/rtp_engine.c
@@ -1798,7 +1798,9 @@ int ast_rtp_engine_unload_format(struct ast_format *format)
rtp_engine_mime_type_cleanup(x);
continue;
}
- ast_rtp_mime_types[y] = ast_rtp_mime_types[x];
+ if (x != y) {
+ ast_rtp_mime_types[y] = ast_rtp_mime_types[x];
+ }
y++;
}
mime_types_len = y;