[Pkg-voip-commits] [janus] 113/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 38519bd42f634313933c7ec2751cc5fa28c2bf05
Merge: 9f37ebe c4c63c9
Author: Lorenzo Miniero <lminiero at gmail.com>
Date:   Thu Sep 28 11:34:51 2017 +0200

    Merge branch 'master' into sipre

 Makefile.am                                   |   6 +-
 conf/janus.transport.websockets.cfg.sample.in |   4 +-
 configure.ac                                  |  55 +--
 html/janus.js                                 |   2 +
 html/janus.nojquery.js                        |   2 +
 html/support.html                             |  10 +-
 html/videoroomtest.js                         |  38 +-
 ice.c                                         |  45 ++-
 ice.h                                         |   5 +
 janus-valgrind.supp                           | 505 ++++++++++++++++++++++++++
 janus.c                                       |  81 ++++-
 mainpage.dox                                  | 135 ++++++-
 plugins/janus_recordplay.c                    | 294 +++++++++++++--
 plugins/janus_streaming.c                     |   9 +-
 plugins/janus_videoroom.c                     |  23 +-
 postprocessing/janus-pp-rec.c                 |  20 +-
 postprocessing/pp-g711.c                      |   6 +-
 postprocessing/pp-g722.c                      | 216 +++++++++++
 postprocessing/pp-g722.h                      |  23 ++
 record.c                                      |   4 +-
 sdp.c                                         |   5 +
 text2pcap.c                                   | 185 ++++++++++
 text2pcap.h                                   |  97 +++++
 transports/janus_http.c                       |   5 +-
 transports/janus_websockets.c                 | 449 ++++-------------------
 25 files changed, 1712 insertions(+), 512 deletions(-)


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