diff options
| author | Richard Mudgett <rmudgett@digium.com> | 2011-10-31 17:51:22 +0000 |
|---|---|---|
| committer | Richard Mudgett <rmudgett@digium.com> | 2011-10-31 17:51:22 +0000 |
| commit | ed1e02a4d35a66697c8c73432c493b155d638c1b (patch) | |
| tree | 266f0f9e02cd197e3b9693ffd38f044cc674455c /main/format_cap.c | |
| parent | 9333071c1f6639095b033a797f3cf2b7a4fc445a (diff) | |
Misc format capability fixes.
* Fixed typo in format_cap.c:joint_copy_helper() using the wrong variable.
* Fix potential race between checking if an interface exists and adding it
to the container in format.c:ast_format_attr_reg_interface().
* Fixed double rwlock destroy in format.c:ast_format_attr_init() error
exit path.
* Simplified format.c:find_interface() and format.c:has_interface().
........
Merged revisions 342824 from http://svn.asterisk.org/svn/asterisk/branches/10
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@342825 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/format_cap.c')
| -rw-r--r-- | main/format_cap.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/main/format_cap.c b/main/format_cap.c index b632a7b1c..a3e513160 100644 --- a/main/format_cap.c +++ b/main/format_cap.c @@ -470,7 +470,7 @@ static int joint_copy_helper(const struct ast_format_cap *cap1, const struct ast if (!append) { ast_format_cap_remove_all(result); } - it = ao2_iterator_init(cap1->formats, cap2->nolock ? AO2_ITERATOR_DONTLOCK : 0); + it = ao2_iterator_init(cap1->formats, cap1->nolock ? AO2_ITERATOR_DONTLOCK : 0); while ((tmp = ao2_iterator_next(&it))) { data.format = tmp; ao2_callback(cap2->formats, |