Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

jami-daemon
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Iterations
- Wiki
- Requirements
- Releases
- Model registry
- Incidents

Snippets Groups Projects

0768eb23

Commit 0768eb23 authored 12 years ago by Tristan Matthews

Downloads
- Plain Diff

Merge branch 'fix_srtp' of...

Merge branch 'fix_srtp' of git+ssh://git.sflphone.org/var/repos/sflphone/git/sflphone into audio_buffers

parents 60b12263 ec51ed77

No related branches found

No related tags found

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

daemon/src/audio/audiortp/audio_rtp_factory.cpp 0 additions, 2 deletions

daemon/src/audio/audiortp/audio_rtp_factory.cpp
daemon/src/audio/audiortp/audio_srtp_session.cpp 17 additions, 11 deletions

daemon/src/audio/audiortp/audio_srtp_session.cpp
daemon/src/audio/pulseaudio/pulselayer.cpp 1 addition, 1 deletion

daemon/src/audio/pulseaudio/pulselayer.cpp
daemon/src/sip/sdes_negotiator.cpp 2 additions, 4 deletions

daemon/src/sip/sdes_negotiator.cpp
daemon/src/sip/sdes_negotiator.h 4 additions, 4 deletions

daemon/src/sip/sdes_negotiator.h
daemon/src/sip/sdp.cpp 0 additions, 2 deletions

daemon/src/sip/sdp.cpp
daemon/src/sip/sipvoiplink.cpp 12 additions, 8 deletions

daemon/src/sip/sipvoiplink.cpp

with 36 additions and 32 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment