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

fc375e45

Commit fc375e45 authored 13 years ago by Emmanuel Milou

Downloads
- Plain Diff

Merge branch 'master' of git+ssh://git.sflphone.org/var/repos/sflphone/git/sflphone

parents 40621152 265d9748

No related branches found

No related tags found

No related merge requests found

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

daemon/src/audio/audiortp/audio_rtp_factory.cpp 14 additions, 18 deletions

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

daemon/src/audio/audiortp/audio_rtp_factory.h
daemon/src/audio/audiortp/audio_srtp_session.cpp 39 additions, 43 deletions

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

daemon/src/audio/audiortp/audio_srtp_session.h

with 64 additions and 72 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