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

a3edac10

Commit a3edac10 authored 5 years ago by Friendly Automation Committed by Gerrit Code Review 5 years ago

Downloads
- Plain Diff

Merge "confbridge: Add support for specifying maximum sample rate." into 16

parents 4b658c82 5622df0a

Branches

Tags

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

apps/app_confbridge.c 2 additions, 0 deletions

apps/app_confbridge.c
apps/confbridge/conf_config_parser.c 17 additions, 0 deletions

apps/confbridge/conf_config_parser.c
apps/confbridge/include/confbridge.h 1 addition, 0 deletions

apps/confbridge/include/confbridge.h
bridges/bridge_softmix.c 17 additions, 1 deletion

bridges/bridge_softmix.c
configs/samples/confbridge.conf.sample 4 additions, 0 deletions

configs/samples/confbridge.conf.sample
doc/CHANGES-staging/app_confbridge_maximum_sample_rate.txt 5 additions, 0 deletions

doc/CHANGES-staging/app_confbridge_maximum_sample_rate.txt
include/asterisk/bridge.h 21 additions, 0 deletions

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

main/bridge.c

with 74 additions and 1 deletion

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