diff options
| author | Sean Bright <sean@malleable.com> | 2015-01-28 12:19:28 +0000 |
|---|---|---|
| committer | Sean Bright <sean@malleable.com> | 2015-01-28 12:19:28 +0000 |
| commit | f080ca65367a7725889ffd9acb6179b9b150993d (patch) | |
| tree | 5f45252e2573cff0eeba5ea5a8dd710b5982fb5a /res/res_format_attr_silk.c | |
| parent | 69e107b24eb15499b7ad8fe03a9368ea55680a8b (diff) | |
media formats: update res_format_attr_opus & silk
In r419044, we changed how formats were handled, but the return value
of the format_parse_sdp_fmtp functions in res_format_attr_opus and
res_format_attr_silk were not updated, causing calls to fail. Ran
into this when getting codec_opus working with Asterisk 13.
Once the return value was corrected, we were crashing in opus_getjoint
because of NULL format attributes. I've fixed this as well in this
patch.
Review: https://reviewboard.asterisk.org/r/4371/
........
Merged revisions 431267 from http://svn.asterisk.org/svn/asterisk/branches/13
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@431268 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'res/res_format_attr_silk.c')
| -rw-r--r-- | res/res_format_attr_silk.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/res/res_format_attr_silk.c b/res/res_format_attr_silk.c index 365cacc42..3a8ca60d2 100644 --- a/res/res_format_attr_silk.c +++ b/res/res_format_attr_silk.c @@ -94,7 +94,7 @@ static struct ast_format *silk_parse_sdp_fmtp(const struct ast_format *format, c attr->fec = val; } - return 0; + return cloned; } static void silk_generate_sdp_fmtp(const struct ast_format *format, unsigned int payload, struct ast_str **str) |