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

90e271a9

Commit 90e271a9 authored 12 years ago by Alexandre Savard

Downloads
- Plain Diff

Merge branch 'hold_secured_call'

parents 8feb0fdf e71c6675

No related branches found

No related tags found

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

daemon/src/audio/audiortp/audio_rtp_factory.cpp 37 additions, 8 deletions

daemon/src/audio/audiortp/audio_rtp_factory.cpp
daemon/src/audio/audiortp/audio_rtp_factory.h 33 additions, 5 deletions

daemon/src/audio/audiortp/audio_rtp_factory.h
daemon/src/audio/audiortp/audio_srtp_session.cpp 100 additions, 47 deletions

daemon/src/audio/audiortp/audio_srtp_session.cpp
daemon/src/audio/audiortp/audio_srtp_session.h 106 additions, 24 deletions

daemon/src/audio/audiortp/audio_srtp_session.h
daemon/src/sip/sipvoiplink.cpp 7 additions, 3 deletions

daemon/src/sip/sipvoiplink.cpp

with 283 additions and 87 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