diff options
| author | irungentoo <irungentoo@gmail.com> | 2014-06-28 22:29:39 -0400 |
|---|---|---|
| committer | irungentoo <irungentoo@gmail.com> | 2014-06-28 22:29:39 -0400 |
| commit | bd6f8a2186d73df531552457840d2260339f14b3 (patch) | |
| tree | 4489b6d101b878a5f6782253cd801223a7a75806 /toxav/toxav.c | |
| parent | f4330658753e2ef01dfb32b0cebfe2b8d3cabfc9 (diff) | |
| parent | aeaf997ca57052a1589699c8ddfd9a75ca398180 (diff) | |
Merge branch 'mannol1-master'
Diffstat (limited to 'toxav/toxav.c')
| -rw-r--r-- | toxav/toxav.c | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/toxav/toxav.c b/toxav/toxav.c index ab5fe611..ad8e651f 100644 --- a/toxav/toxav.c +++ b/toxav/toxav.c | |||
| @@ -304,14 +304,7 @@ int toxav_prepare_transmission ( ToxAv *av, int32_t call_index, ToxAvCodecSettin | |||
| 304 | CallSpecific *call = &av->calls[call_index]; | 304 | CallSpecific *call = &av->calls[call_index]; |
| 305 | 305 | ||
| 306 | call->crtps[audio_index] = | 306 | call->crtps[audio_index] = |
| 307 | rtp_init_session( | 307 | rtp_init_session(type_audio, av->messenger, av->msi_session->calls[call_index]->peers[0]); |
| 308 | type_audio, | ||
| 309 | av->messenger, | ||
| 310 | av->msi_session->calls[call_index]->peers[0], | ||
| 311 | av->msi_session->calls[call_index]->key_peer, | ||
| 312 | av->msi_session->calls[call_index]->key_local, | ||
| 313 | av->msi_session->calls[call_index]->nonce_peer, | ||
| 314 | av->msi_session->calls[call_index]->nonce_local); | ||
| 315 | 308 | ||
| 316 | 309 | ||
| 317 | if ( !call->crtps[audio_index] ) { | 310 | if ( !call->crtps[audio_index] ) { |
| @@ -322,14 +315,7 @@ int toxav_prepare_transmission ( ToxAv *av, int32_t call_index, ToxAvCodecSettin | |||
| 322 | 315 | ||
| 323 | if ( support_video ) { | 316 | if ( support_video ) { |
| 324 | call->crtps[video_index] = | 317 | call->crtps[video_index] = |
| 325 | rtp_init_session ( | 318 | rtp_init_session(type_video, av->messenger, av->msi_session->calls[call_index]->peers[0]); |
| 326 | type_video, | ||
| 327 | av->messenger, | ||
| 328 | av->msi_session->calls[call_index]->peers[0], | ||
| 329 | av->msi_session->calls[call_index]->key_peer, | ||
| 330 | av->msi_session->calls[call_index]->key_local, | ||
| 331 | av->msi_session->calls[call_index]->nonce_peer, | ||
| 332 | av->msi_session->calls[call_index]->nonce_local); | ||
| 333 | 319 | ||
| 334 | 320 | ||
| 335 | if ( !call->crtps[video_index] ) { | 321 | if ( !call->crtps[video_index] ) { |