kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-05 20:20:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

res_format_attr_h264: Fix crash when determining joint capability.

Browse Source 
The res_format_attr_h264 module currently incorrectly attempts to
copy SPS and PPS information from the wrong attribute. This change
fixes that.

ASTERISK-24616 #close
Reported by: Yura Kocyuba

Review: https://reviewboard.asterisk.org/r/4392/
........

Merged revisions 431521 from http://svn.asterisk.org/svn/asterisk/branches/13


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@431522 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Joshua Colp
2015-01-31 16:28:33 +00:00
parent 23bb5f6a73
commit 14a57782a6
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
res/res_format_attr_h264.c
View File

@@ -153,13 +153,13 @@ static struct ast_format *h264_getjoint(const struct ast_format *format1, const
if (attr1 && !ast_strlen_zero(attr1->SPS)) { if (attr1 && !ast_strlen_zero(attr1->SPS)) {
ast_copy_string(attr->SPS, attr1->SPS, sizeof(attr->SPS)); ast_copy_string(attr->SPS, attr1->SPS, sizeof(attr->SPS));
} else if (attr2 && !ast_strlen_zero(attr2->SPS)) { } else if (attr2 && !ast_strlen_zero(attr2->SPS)) {
ast_copy_string(attr->SPS, attr1->SPS, sizeof(attr->SPS)); ast_copy_string(attr->SPS, attr2->SPS, sizeof(attr->SPS));
} }
if (attr1 && !ast_strlen_zero(attr1->PPS)) { if (attr1 && !ast_strlen_zero(attr1->PPS)) {
ast_copy_string(attr->PPS, attr1->PPS, sizeof(attr->PPS)); ast_copy_string(attr->PPS, attr1->PPS, sizeof(attr->PPS));
} else if (attr2 && !ast_strlen_zero(attr2->PPS)) { } else if (attr2 && !ast_strlen_zero(attr2->PPS)) {
ast_copy_string(attr->PPS, attr1->PPS, sizeof(attr->PPS)); ast_copy_string(attr->PPS, attr2->PPS, sizeof(attr->PPS));
} }
return cloned; return cloned;