[Pkg-voip-commits] [janus] 96/282: Merge branch 'master' into nosip

[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 ed622c295ea879245bd40b81e2f70cb2458c3996
Merge: 47eb485 073a486
Author: Lorenzo Miniero <lminiero at gmail.com>
Date:   Fri Jul 28 12:15:51 2017 +0200

    Merge branch 'master' into nosip

 README.md                                    |   2 +-
 conf/janus.plugin.streaming.cfg.sample.in    |   3 +
 conf/janus.plugin.videoroom.cfg.sample       |  16 +
 configure.ac                                 |   2 +-
 docs/janus-doxygen.cfg                       |   2 +-
 html/demos.html                              |   4 +
 html/devicetest.html                         |   8 +-
 html/devicetest.js                           | 155 +++++-
 html/echotest.html                           |  10 +-
 html/echotest.js                             | 155 ++++++
 html/janus.js                                | 245 ++++++++-
 html/janus.nojquery.js                       | 245 ++++++++-
 html/navbar.html                             |   1 +
 html/streamingtest.html                      |   8 +-
 html/streamingtest.js                        | 185 +++++++
 html/videocalltest.html                      |  14 +
 html/videocalltest.js                        | 152 ++++++
 html/videoroomtest.html                      |  32 +-
 html/videoroomtest.js                        | 167 ++++++
 html/{videoroomtest.html => vp9svctest.html} |  65 ++-
 html/{videoroomtest.js => vp9svctest.js}     | 151 +++++-
 ice.c                                        |  53 +-
 ice.h                                        |   6 +
 janus.c                                      |  46 +-
 janus.ggo                                    |   2 +-
 plugins/janus_echotest.c                     | 342 ++++++++++++-
 plugins/janus_recordplay.c                   |  21 +-
 plugins/janus_sip.c                          |  29 +-
 plugins/janus_streaming.c                    | 731 +++++++++++++++++----------
 plugins/janus_videocall.c                    | 257 +++++++++-
 plugins/janus_videoroom.c                    | 599 ++++++++++++++++++++--
 postprocessing/pp-webm.c                     |   2 +-
 rtcp.c                                       |  16 +-
 rtcp.h                                       |  12 +-
 rtp.c                                        |  33 +-
 rtp.h                                        |  13 +
 sdp.c                                        | 130 ++++-
 sdp.h                                        |   8 +
 utils.c                                      | 441 ++++++++++++++++
 utils.h                                      |  63 +++
 40 files changed, 3998 insertions(+), 428 deletions(-)


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