Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

A

asterisk
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents

Snippets Groups Projects

e7b22ee1

Commit e7b22ee1 authored 6 years ago by Joshua Colp Committed by Gerrit Code Review 6 years ago

Downloads
- Plain Diff

Merge "bridge_softmix: Add SDP "label" attribute to streams"

parents 07c950b2 8d1c6bb6

No related branches found

No related tags found

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

apps/app_confbridge.c 4 additions, 0 deletions

apps/app_confbridge.c
apps/confbridge/confbridge_manager.c 0 additions, 53 deletions

apps/confbridge/confbridge_manager.c
bridges/bridge_softmix.c 25 additions, 10 deletions

bridges/bridge_softmix.c
include/asterisk/bridge.h 19 additions, 0 deletions

include/asterisk/bridge.h
main/bridge.c 7 additions, 0 deletions

main/bridge.c

with 55 additions and 63 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