[Pkg-voip-commits] [janus] 15/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 2990ee55e6536ca8ebaaf80acaffc3231d52c663
Merge: a2bf959 9380393
Author: Lorenzo Miniero <lminiero at gmail.com>
Date:   Fri Mar 17 17:58:11 2017 +0100

    Merge branch 'master' into sipre

 .gitignore                                         |   1 +
 Makefile.am                                        |  21 ++-
 README.md                                          |  42 ++---
 conf/janus.cfg.sample.in                           |  18 +-
 conf/janus.plugin.audiobridge.cfg.sample           |   2 +-
 conf/janus.plugin.streaming.cfg.sample.in          |   5 +
 conf/janus.plugin.videoroom.cfg.sample             |   2 +-
 ...sample => janus.plugin.voicemail.cfg.sample.in} |   2 +-
 conf/janus.transport.pfunix.cfg.sample             |   9 +-
 configure.ac                                       |  22 ++-
 docs/footer.html                                   |   4 +-
 docs/janus-doxygen.cfg                             |   2 +-
 html/janus.js                                      |  13 +-
 html/janus.nojquery.js                             |  37 ++++-
 html/up_arrow.png                                  | Bin 5327 -> 2611 bytes
 ice.c                                              | 110 +++++++-----
 ice.h                                              |   8 +-
 ip-utils.c                                         | 184 +++++++++++++++++----
 ip-utils.h                                         | 115 +++++++++----
 janus.1                                            |   3 +
 janus.c                                            | 134 ++++++---------
 mainpage.dox                                       |  19 ++-
 plugins/janus_audiobridge.c                        |  18 +-
 plugins/janus_echotest.c                           |   3 +-
 plugins/janus_recordplay.c                         | 168 ++++++++-----------
 plugins/janus_sip.c                                | 101 ++++-------
 plugins/janus_streaming.c                          | 119 +++++++------
 plugins/janus_textroom.c                           |   2 +-
 plugins/janus_videocall.c                          |  23 +--
 plugins/janus_videoroom.c                          |   3 +-
 plugins/janus_voicemail.c                          |   3 +-
 record.c                                           |  13 +-
 sctp.c                                             |   8 +-
 transports/janus_http.c                            |  70 ++++++--
 transports/janus_pfunix.c                          |  43 ++++-
 turnrest.c                                         |  15 +-
 utils.c                                            |  66 --------
 utils.h                                            |  18 --
 38 files changed, 800 insertions(+), 626 deletions(-)

diff --cc utils.h
index dcafd4c,487092e..900143b
--- a/utils.h
+++ b/utils.h
@@@ -14,17 -14,13 +14,16 @@@
  
  #include <stdint.h>
  #include <glib.h>
- #include <netinet/in.h>
  #include <jansson.h>
  
 +#define JANUS_JSON_STRING			JSON_STRING
 +#define JANUS_JSON_INTEGER			JSON_INTEGER
 +#define JANUS_JSON_OBJECT			JSON_OBJECT
  /* Use JANUS_JSON_BOOL instead of the non-existing JSON_BOOLEAN */
 -#define JANUS_JSON_BOOL JSON_TRUE
 -#define JANUS_JSON_PARAM_REQUIRED 1
 -#define JANUS_JSON_PARAM_POSITIVE 2
 -#define JANUS_JSON_PARAM_NONEMPTY 4
 +#define JANUS_JSON_BOOL				JSON_TRUE
 +#define JANUS_JSON_PARAM_REQUIRED	1
 +#define JANUS_JSON_PARAM_POSITIVE	2
 +#define JANUS_JSON_PARAM_NONEMPTY	4
  
  struct janus_json_parameter {
  	const gchar *name;

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