diff options
author | irungentoo <irungentoo@gmail.com> | 2014-07-05 12:25:30 -0400 |
---|---|---|
committer | irungentoo <irungentoo@gmail.com> | 2014-07-05 12:25:30 -0400 |
commit | a51f6bbd694e016cb89739da3201d5ad399f306c (patch) | |
tree | 01ba3f79e0621e9831229f45a01856524352eb1f /toxav/rtp.c | |
parent | 7f1e5ff72038b055aad7a9edd99e2632db56b3dd (diff) | |
parent | 9af7c335e7f198e6ac2ebe7554be2b30ffcbfbb4 (diff) |
Merge branch 'mannol1-master'
Diffstat (limited to 'toxav/rtp.c')
-rw-r--r-- | toxav/rtp.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/toxav/rtp.c b/toxav/rtp.c index aa5e2635..653a22df 100644 --- a/toxav/rtp.c +++ b/toxav/rtp.c | |||
@@ -703,12 +703,9 @@ RTPSession *rtp_init_session ( int payload_type, Messenger *messenger, int frien | |||
703 | * @retval -1 Error occurred. | 703 | * @retval -1 Error occurred. |
704 | * @retval 0 Success. | 704 | * @retval 0 Success. |
705 | */ | 705 | */ |
706 | int rtp_terminate_session ( RTPSession *session, Messenger *messenger ) | 706 | void rtp_terminate_session ( RTPSession *session, Messenger *messenger ) |
707 | { | 707 | { |
708 | if ( !session ) { | 708 | if ( !session ) return; |
709 | LOGGER_WARNING("No session!"); | ||
710 | return -1; | ||
711 | } | ||
712 | 709 | ||
713 | custom_lossy_packet_registerhandler(messenger, session->dest, session->prefix, NULL, NULL); | 710 | custom_lossy_packet_registerhandler(messenger, session->dest, session->prefix, NULL, NULL); |
714 | 711 | ||
@@ -723,8 +720,9 @@ int rtp_terminate_session ( RTPSession *session, Messenger *messenger ) | |||
723 | 720 | ||
724 | pthread_mutex_destroy(&session->mutex); | 721 | pthread_mutex_destroy(&session->mutex); |
725 | 722 | ||
723 | LOGGER_DEBUG("Terminated RTP session: %p", session); | ||
724 | |||
726 | /* And finally free session */ | 725 | /* And finally free session */ |
727 | free ( session ); | 726 | free ( session ); |
728 | 727 | ||
729 | return 0; | 728 | } |
730 | } \ No newline at end of file | ||