diff options
| author | David Vossel <dvossel@digium.com> | 2011-02-10 17:12:10 +0000 |
|---|---|---|
| committer | David Vossel <dvossel@digium.com> | 2011-02-10 17:12:10 +0000 |
| commit | 08460fc094fc0defe5bf678fa6c56b4a404aa728 (patch) | |
| tree | b1178c2a1616b098ffab3d86a90daae67a464f6d /include/asterisk | |
| parent | 707cf78c5af4ae221225a0351d79e0ddea5add26 (diff) | |
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
Diffstat (limited to 'include/asterisk')
| -rw-r--r-- | include/asterisk/format_cap.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/include/asterisk/format_cap.h b/include/asterisk/format_cap.h index 301ec1471..cdb5421f9 100644 --- a/include/asterisk/format_cap.h +++ b/include/asterisk/format_cap.h @@ -192,6 +192,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. * |