[Pkg-voip-commits] [janus] 231/282: Merge branch 'master' into icesend-perf

[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 ad50fb8360af6ec6fa4749b4de69cd81971c166b
Merge: 3e52946 c0186ad
Author: Lorenzo Miniero <lminiero at gmail.com>
Date:   Thu Nov 30 16:04:20 2017 +0100

    Merge branch 'master' into icesend-perf

 apierror.h                    |   2 +
 html/screensharingtest.js     |  14 ++-
 html/videoroomtest.js         |   2 +-
 ice.c                         | 191 +++++++++++++++++++++++++----------------
 ice.h                         |   2 +
 janus.c                       |  12 ++-
 plugins/janus_audiobridge.c   |  65 ++++++++++----
 plugins/janus_echotest.c      |  59 +++++++++----
 plugins/janus_nosip.c         |  47 +++++++---
 plugins/janus_recordplay.c    | 194 ++++++++++++++++++++++++------------------
 plugins/janus_sip.c           |  49 ++++++++---
 plugins/janus_sipre.c         |  47 +++++++---
 plugins/janus_streaming.c     | 126 ++++++++++++++-------------
 plugins/janus_textroom.c      |  66 +++++++++-----
 plugins/janus_videoroom.c     |  70 ++++++++++-----
 plugins/janus_voicemail.c     |  45 +++++++---
 postprocessing/pp-h264.c      |   4 +
 postprocessing/pp-webm.c      |   4 +
 sctp.c                        |  68 ++++++++++-----
 sctp.h                        |   6 ++
 transports/janus_pfunix.c     |  38 +++++----
 transports/janus_websockets.c |   2 +
 22 files changed, 735 insertions(+), 378 deletions(-)


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