Merge branch 'avfix' of https://github.com/aitjcize/ProjectTox-Core into aitjcize-avfix

This commit is contained in:
irungentoo 2014-04-09 19:54:34 -04:00
commit 05025482e3
No known key found for this signature in database
GPG Key ID: 10349DC9BED89E98
3 changed files with 4 additions and 3 deletions

View File

@ -559,9 +559,9 @@ void *decode_video_thread(void *arg)
while (_phone->running_decvid) {
//recved_size = toxav_recv_rtp_payload(_phone->av, TypeVideo, dest);
//if (recved_size) {
vpx_image_t *image;
vpx_image_t *image = NULL;
if (toxav_recv_video(_phone->av, &image) == 0) {
if (toxav_recv_video(_phone->av, &image) == 0 && image) {
//memcpy(dec_video_packet.data, dest, recved_size);
//dec_video_packet.size = recved_size;

View File

@ -752,6 +752,7 @@ int rtp_send_msg ( RTPSession *session, Messenger *messenger, const uint8_t *dat
/*if ( full_length != sendpacket ( messenger->net, *((IP_Port*) &session->dest), _send_data, full_length) ) {*/
if ( full_length != send_custom_user_packet(messenger, session->dest, _send_data, full_length) ) {
/*fprintf(stderr, "Rtp error: %s\n", strerror(errno));*/
rtp_free_msg ( session, msg );
return -1;
}