Merge branch 'split-video' of https://github.com/notsecure/toxcore into notsecure-split-video

This commit is contained in:
irungentoo 2014-07-23 13:32:00 -04:00
commit f6d829d8f0
No known key found for this signature in database
GPG Key ID: 10349DC9BED89E98
2 changed files with 3 additions and 3 deletions

View File

@ -1411,7 +1411,6 @@ static void msi_handle_packet ( Messenger *messenger, int source, const uint8_t
LOGGER_WARNING("Invalid message: no resp nor requ headers");
}
free_end:
free ( msg );
}
@ -1658,7 +1657,8 @@ int msi_answer ( MSISession *session, int32_t call_index, MSICallType call_type
session->calls[call_index]->type_local = call_type;
msi_msg_set_calltype(msg_starting, call_type);
send_message ( session, session->calls[call_index], msg_starting, 0 );
send_message ( session, session->calls[call_index], msg_starting, session->calls[call_index]->peers[0] );
free ( msg_starting );
session->calls[call_index]->state = call_active;

View File

@ -272,7 +272,7 @@ int toxav_reject ( ToxAv *av, int32_t call_index, const char *reason )
return ErrorInvalidState;
}
return msi_reject(av->msi_session, call_index, (const uint8_t *) reason);
return msi_reject(av->msi_session, call_index, reason);
}
/**