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

28c541fa

Commit 28c541fa authored 15 years ago by Emmanuel Milou

Downloads
- Plain Diff

Merge branch 'm_savard'

parents 64fb852b 91f0ae75

No related branches found

No related tags found

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

sflphone-common/src/audio/audiortp.cpp 161 additions, 179 deletions

sflphone-common/src/audio/audiortp.cpp
sflphone-common/src/audio/audiortp.h 47 additions, 8 deletions

sflphone-common/src/audio/audiortp.h
sflphone-common/src/audio/audiostream.cpp 12 additions, 5 deletions

sflphone-common/src/audio/audiostream.cpp
sflphone-common/src/audio/codecDescriptor.h 2 additions, 0 deletions

sflphone-common/src/audio/codecDescriptor.h
sflphone-common/src/sdp.cpp 5 additions, 1 deletion

sflphone-common/src/sdp.cpp
sflphone-common/src/sipvoiplink.cpp 73 additions, 83 deletions

sflphone-common/src/sipvoiplink.cpp
sflphone-common/test/rtpTest.cpp 3 additions, 3 deletions

sflphone-common/test/rtpTest.cpp

with 303 additions and 279 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