Author: file Date: Sat Jan 31 10:28:33 2015 New Revision: 431522 URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=431522 Log: res_format_attr_h264: Fix crash when determining joint capability.
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 Modified: trunk/ (props changed) trunk/res/res_format_attr_h264.c Propchange: trunk/ ------------------------------------------------------------------------------ Binary property 'branch-13-merged' - no diff available. Modified: trunk/res/res_format_attr_h264.c URL: http://svnview.digium.com/svn/asterisk/trunk/res/res_format_attr_h264.c?view=diff&rev=431522&r1=431521&r2=431522 ============================================================================== --- trunk/res/res_format_attr_h264.c (original) +++ trunk/res/res_format_attr_h264.c Sat Jan 31 10:28:33 2015 @@ -153,13 +153,13 @@ if (attr1 && !ast_strlen_zero(attr1->SPS)) { ast_copy_string(attr->SPS, attr1->SPS, sizeof(attr->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)) { ast_copy_string(attr->PPS, attr1->PPS, sizeof(attr->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; -- _____________________________________________________________________ -- Bandwidth and Colocation Provided by http://www.api-digital.com -- svn-commits mailing list To UNSUBSCRIBE or update options visit: http://lists.digium.com/mailman/listinfo/svn-commits
