[Pkg-voip-commits] [janus] 27/282: Merge branch 'master' into sipre

[Jonas Smedegaard]

This is an automated email from the git hooks/post-receive script.

js pushed a commit to annotated tag debian/0.2.6-1
in repository janus.

commit 65e4c30e2ab973a59574dc6f11515d7e77685f66
Merge: 1ebd18e bf37ced
Author: Lorenzo Miniero <lminiero at gmail.com>
Date:   Wed Apr 19 18:00:48 2017 +0200

    Merge branch 'master' into sipre

 .gitignore                               |   1 +
 Makefile.am                              |  23 +-
 README.md                                |  13 +-
 conf/janus.plugin.audiobridge.cfg.sample |   3 +
 conf/janus.plugin.videoroom.cfg.sample   |   5 +
 conf/janus.transport.rabbitmq.cfg.sample |   7 +
 configure.ac                             |   2 +-
 html/echotest.html                       |   2 +-
 ice.c                                    |  40 +--
 ice.h                                    |   6 +-
 janus.c                                  |  11 +-
 plugins/janus_audiobridge.c              | 154 +++++++++-
 plugins/janus_recordplay.c               |   2 -
 plugins/janus_sip.c                      | 156 ++++++++--
 plugins/janus_streaming.c                | 470 ++++++++++++++++++++++---------
 plugins/janus_textroom.c                 |   8 +
 plugins/janus_videocall.c                |   3 -
 plugins/janus_videoroom.c                | 303 +++++++++++++++++---
 sctp.c                                   |   1 +
 sdp-utils.c                              |  15 +
 sdp-utils.h                              |   2 +
 transports/janus_http.c                  |  33 +--
 transports/janus_mqtt.c                  |  12 +-
 transports/janus_pfunix.c                |   2 +-
 transports/janus_rabbitmq.c              |  80 +++++-
 transports/janus_websockets.c            |   2 +-
 version.h                                |  19 ++
 27 files changed, 1091 insertions(+), 284 deletions(-)


-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-voip/janus.git