Merge remote-tracking branch 'public/master' into 3.0.x

This commit is contained in:
Gautier Pelloux-Prayer 2015-09-11 15:39:53 +02:00
commit d3ed4277e0
2 changed files with 4 additions and 4 deletions

View file

@ -24,8 +24,8 @@ rtcp_xr_stat_summary_enabled=1
rtcp_xr_voip_metrics_enabled=1
[rtp]
audio_rtp_port=7076
video_rtp_port=9078
audio_rtp_port=7200-7299
video_rtp_port=9200-9299
audio_jitt_comp=60
video_jitt_comp=60
nortp_timeout=30

View file

@ -24,8 +24,8 @@ rtcp_xr_stat_summary_enabled=1
rtcp_xr_voip_metrics_enabled=1
[rtp]
audio_rtp_port=7076
video_rtp_port=9078
audio_rtp_port=7200-7299
video_rtp_port=9200-9299
audio_jitt_comp=60
video_jitt_comp=60
nortp_timeout=30