diff options
author | mannol <eniz_vukovic@hotmail.com> | 2014-05-22 00:08:19 +0200 |
---|---|---|
committer | mannol <eniz_vukovic@hotmail.com> | 2014-05-22 00:08:19 +0200 |
commit | 9db41e7582baf15d650376e8afc38dd6146492a8 (patch) | |
tree | 38c5d6b6066a1c3aba43d21ba78740ceb6b22323 /toxav/rtp.c | |
parent | 0620d1f0643d0f8a6a7d9361615b164242559768 (diff) | |
parent | be4559de73c17bcfa396098d6cc48b7a4b1157c6 (diff) |
Merge remote-tracking branch 'upstream/master' into Multicalls-patch
Diffstat (limited to 'toxav/rtp.c')
-rwxr-xr-x | toxav/rtp.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/toxav/rtp.c b/toxav/rtp.c index cdaabd3a..1a42f99e 100755 --- a/toxav/rtp.c +++ b/toxav/rtp.c | |||
@@ -500,7 +500,7 @@ RTPMessage *msg_parse ( uint16_t sequnum, const uint8_t *data, int length ) | |||
500 | * @retval -1 Error occurred. | 500 | * @retval -1 Error occurred. |
501 | * @retval 0 Success. | 501 | * @retval 0 Success. |
502 | */ | 502 | */ |
503 | int rtp_handle_packet ( void *object, IP_Port ip_port, uint8_t *data, uint32_t length ) | 503 | int rtp_handle_packet ( void *object, uint8_t *data, uint32_t length ) |
504 | { | 504 | { |
505 | RTPSession *_session = object; | 505 | RTPSession *_session = object; |
506 | RTPMessage *_msg; | 506 | RTPMessage *_msg; |
@@ -570,11 +570,6 @@ int rtp_handle_packet ( void *object, IP_Port ip_port, uint8_t *data, uint32_t l | |||
570 | return -1; | 570 | return -1; |
571 | } | 571 | } |
572 | 572 | ||
573 | /* Hopefully this goes well | ||
574 | * NOTE: Is this even used? | ||
575 | */ | ||
576 | memcpy(&_msg->from, &ip_port, sizeof(IP_Port)); | ||
577 | |||
578 | /* Check if message came in late */ | 573 | /* Check if message came in late */ |
579 | if ( check_late_message(_session, _msg) < 0 ) { /* Not late */ | 574 | if ( check_late_message(_session, _msg) < 0 ) { /* Not late */ |
580 | _session->rsequnum = _msg->header->sequnum; | 575 | _session->rsequnum = _msg->header->sequnum; |