Fixes bug in chan_sip where nativeformats are not set correctly.

The nativeformats field was being overwritten when it should have been
appended too.  This caused some format capabilities to be lost briefly and
some log warnings to be output.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@307433 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
David Vossel
2011-02-10 17:12:10 +00:00
parent 707cf78c5a
commit 08460fc094
3 changed files with 24 additions and 5 deletions

View File

@@ -191,6 +191,14 @@ struct ast_format_cap *ast_format_cap_joint(const struct ast_format_cap *cap1, c
*/
int ast_format_cap_joint_copy(const struct ast_format_cap *cap1, const struct ast_format_cap *cap2, struct ast_format_cap *result);
/*!
* \brief Get joint capability structure, append into result capabilities structure
*
* \retval 1, joint capabilities exist
* \retval 0, joint capabilities do not exist
*/
int ast_format_cap_joint_append(const struct ast_format_cap *cap1, const struct ast_format_cap *cap2, struct ast_format_cap *result);
/*!
* \brief Find out if capability structures have any joint capabilities without
* returning those capabilities.