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

a1e9ec40

Commit a1e9ec40 authored 7 years ago by Jenkins2 Committed by Gerrit Code Review 7 years ago

Downloads
- Plain Diff

Merge changes from topic 'ASTERISK-27212'

* changes:
  bridge_channel.c: Fix FRACK when mapping frames to the bridge.
  bridge: Fix softmix bridge deadlock.

parents 9e799762 17976d1b

No related branches found

No related tags found

Loading

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

bridges/bridge_softmix.c 31 additions, 10 deletions

bridges/bridge_softmix.c
include/asterisk/bridge_channel.h 15 additions, 10 deletions

include/asterisk/bridge_channel.h
include/asterisk/bridge_technology.h 18 additions, 8 deletions

include/asterisk/bridge_technology.h
main/bridge_channel.c 76 additions, 14 deletions

main/bridge_channel.c

with 140 additions and 42 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