diff --git a/sflphone-client-gnome/VERSION b/sflphone-client-gnome/VERSION
index e47b076695b64621ec5c2f3985f6a9ddbc81c520..e3e180701e2ae694f8818779c4e28321a6b11b32 100644
--- a/sflphone-client-gnome/VERSION
+++ b/sflphone-client-gnome/VERSION
@@ -1 +1 @@
-0.9.8~rc1
+0.9.8
diff --git a/sflphone-client-gnome/configure.ac b/sflphone-client-gnome/configure.ac
index 3c5d12fee8be8fac7ec79692fe2a008432ac7e60..ff7a520e166c96b3aea26f175869c3fe04d064ae 100644
--- a/sflphone-client-gnome/configure.ac
+++ b/sflphone-client-gnome/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([SFLphone],[0.9.8~rc1],[sflphoneteam@savoirfairelinux.com],[sflphone-client-gnome])
+AC_INIT([SFLphone],[0.9.8],[sflphoneteam@savoirfairelinux.com],[sflphone-client-gnome])
AM_CONFIG_HEADER(config.h)
LT_INIT
diff --git a/sflphone-client-gnome/src/accountlist.c b/sflphone-client-gnome/src/accountlist.c
index d02e23c5feb91879a430ff6ec20d4df3e41acaad..7e6d0c86dd75155b6ac960fe254eef704d2a5d02 100644
--- a/sflphone-client-gnome/src/accountlist.c
+++ b/sflphone-client-gnome/src/accountlist.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2007 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Pierre-Luc Beaudoin <pierre-luc.beaudoin@savoirfairelinux.com>
* Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
*
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <accountlist.h>
diff --git a/sflphone-client-gnome/src/accountlist.h b/sflphone-client-gnome/src/accountlist.h
index bb2de673190d891264292e33e245b8d1924e57ad..1ba201ffa8a4aca27da2210801465211bf24c71a 100644
--- a/sflphone-client-gnome/src/accountlist.h
+++ b/sflphone-client-gnome/src/accountlist.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2007 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Pierre-Luc Beaudoin <pierre-luc@savoirfairelinux.com>
* Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
*
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __ACCOUNTLIST_H__
diff --git a/sflphone-client-gnome/src/actions.c b/sflphone-client-gnome/src/actions.c
index 2910efffe72e036e5e06956873808af97d43894d..2f57ee5679ffc532d29cbae67a2c48bdce079e8d 100644
--- a/sflphone-client-gnome/src/actions.c
+++ b/sflphone-client-gnome/src/actions.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2007 - 2008 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
* Author: Pierre-Luc Beaudoin <pierre-luc.beaudoin@savoirfairelinux.com>
*
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <actions.h>
diff --git a/sflphone-client-gnome/src/actions.h b/sflphone-client-gnome/src/actions.h
index eb63c0eeb5351afeabcaec122e4c804017b6f4b7..8be845e176769555f61d50653b4dc2d0f07b445e 100644
--- a/sflphone-client-gnome/src/actions.h
+++ b/sflphone-client-gnome/src/actions.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2007 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Pierre-Luc Beaudoin <pierre-luc.beaudoin@savoirfairelinux.com>
* Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
*
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __ACTIONS_H__
diff --git a/sflphone-client-gnome/src/callable_obj.c b/sflphone-client-gnome/src/callable_obj.c
index 5efcbeee89e8b5643bd8eb1e843cd04e78fb0afd..e165857433d975f76096b6e3a6acac22e59f2cfe 100644
--- a/sflphone-client-gnome/src/callable_obj.c
+++ b/sflphone-client-gnome/src/callable_obj.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2009 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Julien Bonjean <julien.bonjean@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,6 +15,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <callable_obj.h>
diff --git a/sflphone-client-gnome/src/callable_obj.h b/sflphone-client-gnome/src/callable_obj.h
index 4325b6b345a9781eaaf04eb25c460dc8d0c8fa68..61acd6ce9aa67b87d5517acc84c687b39e04ae58 100644
--- a/sflphone-client-gnome/src/callable_obj.h
+++ b/sflphone-client-gnome/src/callable_obj.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2009 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Julien Bonjean <julien.bonjean@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,6 +15,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __CALLABLE_OBJ_H__
diff --git a/sflphone-client-gnome/src/codeclist.c b/sflphone-client-gnome/src/codeclist.c
index 83f8892ac4603b889f92e0950125d19d7b2b044b..21037b01fb90572cc16ddf4c72234b11df2e7f7d 100644
--- a/sflphone-client-gnome/src/codeclist.c
+++ b/sflphone-client-gnome/src/codeclist.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2007 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.net>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,6 +15,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <codeclist.h>
diff --git a/sflphone-client-gnome/src/codeclist.h b/sflphone-client-gnome/src/codeclist.h
index 4a1a5f5dda31f0fb04e12591f142bc931b849778..0737f3853d10c77bb22bdca2efdb5cac89113bf6 100644
--- a/sflphone-client-gnome/src/codeclist.h
+++ b/sflphone-client-gnome/src/codeclist.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2007 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.net>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,6 +15,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __CODECLIST_H__
diff --git a/sflphone-client-gnome/src/conference_obj.c b/sflphone-client-gnome/src/conference_obj.c
index 72c45f54962e05789e753730677ecebc1d1c0270..3b534e079ab6d5c9e53e8615b254ebdb444b1fa5 100644
--- a/sflphone-client-gnome/src/conference_obj.c
+++ b/sflphone-client-gnome/src/conference_obj.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2009 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Alexandre Savard <alexandre.savard@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,6 +15,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <callable_obj.h>
diff --git a/sflphone-client-gnome/src/conference_obj.h b/sflphone-client-gnome/src/conference_obj.h
index 1ac8016145b964f2eab8ba4368532e91e1f5ae57..5215ee7bd5aebbc9bea181e6fb622a34b42c6a55 100644
--- a/sflphone-client-gnome/src/conference_obj.h
+++ b/sflphone-client-gnome/src/conference_obj.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2009 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Alexandre Savard <alexandre.savard@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,6 +15,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __CONFERENCE_OBJ_H__
diff --git a/sflphone-client-gnome/src/config/accountconfigdialog.c b/sflphone-client-gnome/src/config/accountconfigdialog.c
index b931e28873cbad832d9843810b9bbb602b6d42a1..a3757c13dbfed920181cf8a543868ea5ad6603fe 100644
--- a/sflphone-client-gnome/src/config/accountconfigdialog.c
+++ b/sflphone-client-gnome/src/config/accountconfigdialog.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2007-2008 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
* Author: Pierre-Luc Beaudoin <pierre-luc.beaudoin@savoirfairelinux.com>
* Author: Pierre-Luc Bacon <pierre-luc.bacon@savoirfairelinux.com>
@@ -17,6 +17,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <actions.h>
diff --git a/sflphone-client-gnome/src/config/accountconfigdialog.h b/sflphone-client-gnome/src/config/accountconfigdialog.h
index 7ac27c3f6b66bfefcc82678aadbddea605d4512a..dee7c8d33e3742dbc8600985d8d480f7a2653531 100644
--- a/sflphone-client-gnome/src/config/accountconfigdialog.h
+++ b/sflphone-client-gnome/src/config/accountconfigdialog.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2007 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Pierre-Luc Beaudoin <pierre-luc.beaudoin@savoirfairelinux.com>
* Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
*
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __ACCOUNTWINDOW_H__
diff --git a/sflphone-client-gnome/src/config/accountlistconfigdialog.c b/sflphone-client-gnome/src/config/accountlistconfigdialog.c
index 38d0769301453e846b5f32a07a9099d339f9c6e6..0c6a975e8e342d29ee5d039adf1729361034ed48 100644
--- a/sflphone-client-gnome/src/config/accountlistconfigdialog.c
+++ b/sflphone-client-gnome/src/config/accountlistconfigdialog.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2007 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Pierre-Luc Beaudoin <pierre-luc.beaudoin@savoirfairelinux.com>
* Author: Pierre-Luc Bacon <pierre-luc.bacon@savoirfairelinux.com>
*
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
diff --git a/sflphone-client-gnome/src/config/accountlistconfigdialog.h b/sflphone-client-gnome/src/config/accountlistconfigdialog.h
index 0990ef93d48381c91c4cc3887049dd1a968dff07..a1ec479f2b6d274d4b2d81b0cb5fba673e56c605 100644
--- a/sflphone-client-gnome/src/config/accountlistconfigdialog.h
+++ b/sflphone-client-gnome/src/config/accountlistconfigdialog.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2007 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Pierre-Luc Bacon <pierre-luc.bacon@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,6 +15,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
diff --git a/sflphone-client-gnome/src/config/addressbook-config.c b/sflphone-client-gnome/src/config/addressbook-config.c
index dff6686508fe81dd45f40626bb0fc73a4ef0b4b2..34a2d05583f31cab857c00a11cfdbb0f90253c28 100644
--- a/sflphone-client-gnome/src/config/addressbook-config.c
+++ b/sflphone-client-gnome/src/config/addressbook-config.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2009 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,6 +15,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include "addressbook-config.h"
diff --git a/sflphone-client-gnome/src/config/addressbook-config.h b/sflphone-client-gnome/src/config/addressbook-config.h
index 85e00a3d54b4e949d07bc7347c6a4f2ba18d294d..fb419e876db7d59fd59f0de69909211ccff7078e 100644
--- a/sflphone-client-gnome/src/config/addressbook-config.h
+++ b/sflphone-client-gnome/src/config/addressbook-config.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2009 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,6 +15,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef _ADDRESS_BOOK_CONFIG
diff --git a/sflphone-client-gnome/src/config/assistant.c b/sflphone-client-gnome/src/config/assistant.c
index 7725235226025620f7c88e285c6d5338c77c82c5..7b5c342a81312a6c0b292aa3bdcd9511a980de53 100644
--- a/sflphone-client-gnome/src/config/assistant.c
+++ b/sflphone-client-gnome/src/config/assistant.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008 2009, Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,6 +15,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
*Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <string.h>
diff --git a/sflphone-client-gnome/src/config/assistant.h b/sflphone-client-gnome/src/config/assistant.h
index 4bf361961eb5da85fbbde90fbe2809797ffd8738..2ac083e04cb5d26ab14208291d50896a2bbe5f00 100644
--- a/sflphone-client-gnome/src/config/assistant.h
+++ b/sflphone-client-gnome/src/config/assistant.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,6 +15,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __ASSISTANT_H
diff --git a/sflphone-client-gnome/src/config/audioconf.c b/sflphone-client-gnome/src/config/audioconf.c
index dcaa7e85ce1c909077a2f0b644adfa327a14b716..29ec95f57ba570700c07a4e68e393b5ac0973426 100644
--- a/sflphone-client-gnome/src/config/audioconf.c
+++ b/sflphone-client-gnome/src/config/audioconf.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,6 +15,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <audioconf.h>
diff --git a/sflphone-client-gnome/src/config/audioconf.h b/sflphone-client-gnome/src/config/audioconf.h
index 18a1232ff25b3c600ce2b359f0355791b5084331..b195b947d8ce1d0b6ff6f35ca0cb077469f56ce4 100644
--- a/sflphone-client-gnome/src/config/audioconf.h
+++ b/sflphone-client-gnome/src/config/audioconf.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,6 +15,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __AUDIO_CONF_H
diff --git a/sflphone-client-gnome/src/config/hooks-config.c b/sflphone-client-gnome/src/config/hooks-config.c
index 0272afd58b0a71b103cbc189aa8a6239cc040fba..7331cc88fc94e634f1097c7585ff12e71d66ee8c 100644
--- a/sflphone-client-gnome/src/config/hooks-config.c
+++ b/sflphone-client-gnome/src/config/hooks-config.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2009 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,6 +15,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include "hooks-config.h"
diff --git a/sflphone-client-gnome/src/config/hooks-config.h b/sflphone-client-gnome/src/config/hooks-config.h
index 3d8c303b0a8e02a9a24c26372ded4983075ce3d0..5fcd951b21c4105b25842955b2b1cfd75e73a40a 100644
--- a/sflphone-client-gnome/src/config/hooks-config.h
+++ b/sflphone-client-gnome/src/config/hooks-config.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2009 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,6 +15,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef _HOOKS_CONFIG
diff --git a/sflphone-client-gnome/src/config/preferencesdialog.c b/sflphone-client-gnome/src/config/preferencesdialog.c
index 82570beb2f503b5db1e6b38b22188ca530983377..01be2abd630bcbc1aaac1139cb545c601e2cffea 100644
--- a/sflphone-client-gnome/src/config/preferencesdialog.c
+++ b/sflphone-client-gnome/src/config/preferencesdialog.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2007 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Pierre-Luc Beaudoin <pierre-luc.beaudoin@savoirfairelinux.com>
* Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
* Author: Guillaume Carmel-Archambault <guillaume.carmel-archambault@savoirfairelinux.com>
@@ -18,6 +18,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <gtk/gtk.h>
diff --git a/sflphone-client-gnome/src/config/preferencesdialog.h b/sflphone-client-gnome/src/config/preferencesdialog.h
index b9f3271457bc761840791c3a194610e955a56f8b..e14a240111419084212a5e59f9bcde86b944adb8 100644
--- a/sflphone-client-gnome/src/config/preferencesdialog.h
+++ b/sflphone-client-gnome/src/config/preferencesdialog.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2007 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Pierre-Luc Beaudoin <pierre-luc.beaudoin@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,6 +15,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __CONFIGWINDOW_H__
diff --git a/sflphone-client-gnome/src/config/shortcuts-config.c b/sflphone-client-gnome/src/config/shortcuts-config.c
index 06eb1839a94c5be5c41531a2a0f921ae092a8fe3..64bdfd0d434fe677c195bab07d7f1dffaf51cdf4 100644
--- a/sflphone-client-gnome/src/config/shortcuts-config.c
+++ b/sflphone-client-gnome/src/config/shortcuts-config.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2010 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Julien Bonjean <julien.bonjean@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,6 +15,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include "shortcuts-config.h"
diff --git a/sflphone-client-gnome/src/config/shortcuts-config.h b/sflphone-client-gnome/src/config/shortcuts-config.h
index b7edf5c5499eb2caffc6821495bafa06a3b7edbf..02682ab0a1631384205a7ae4939c4ae25fa48610 100644
--- a/sflphone-client-gnome/src/config/shortcuts-config.h
+++ b/sflphone-client-gnome/src/config/shortcuts-config.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2010 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Julien Bonjean <julien.bonjean@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,6 +15,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef _SHORTCUTS_CONFIG
diff --git a/sflphone-client-gnome/src/config/tlsadvanceddialog.c b/sflphone-client-gnome/src/config/tlsadvanceddialog.c
index 2b1c03e004f5548b47549a174fa4efe027a67198..4050d0338f8ba1b2714ba083b29681444689afaf 100644
--- a/sflphone-client-gnome/src/config/tlsadvanceddialog.c
+++ b/sflphone-client-gnome/src/config/tlsadvanceddialog.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2009 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Pierre-Luc Bacon <pierre-luc.bacon@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,6 +15,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <tlsadvanceddialog.h>
diff --git a/sflphone-client-gnome/src/config/tlsadvanceddialog.h b/sflphone-client-gnome/src/config/tlsadvanceddialog.h
index 4b7702a2324ad086dd81444ea3e1f166c579cd07..4c7ed3a37f04144264d4410b3d54c33d3209ca8b 100644
--- a/sflphone-client-gnome/src/config/tlsadvanceddialog.h
+++ b/sflphone-client-gnome/src/config/tlsadvanceddialog.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2009 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Pierre-Luc Bacon <pierre-luc.bacon@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,6 +15,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __SFL_TLS_ADVANCED_DIALOG__
diff --git a/sflphone-client-gnome/src/config/utils.c b/sflphone-client-gnome/src/config/utils.c
index a1a319ee964cf03c460a3fbdc3e8668955eec46a..7049d796069507e169258f9e792f4c02ed8cb18a 100644
--- a/sflphone-client-gnome/src/config/utils.c
+++ b/sflphone-client-gnome/src/config/utils.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2009 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,6 +15,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include "utils.h"
diff --git a/sflphone-client-gnome/src/config/utils.h b/sflphone-client-gnome/src/config/utils.h
index aa5cf96bd45f0cc2cb0060758b0ecb73185ea653..91b1708e81f59069a18cc7a33b96b4a18ae9aa15 100644
--- a/sflphone-client-gnome/src/config/utils.h
+++ b/sflphone-client-gnome/src/config/utils.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2009 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,6 +15,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef _UTILS_
diff --git a/sflphone-client-gnome/src/config/zrtpadvanceddialog.c b/sflphone-client-gnome/src/config/zrtpadvanceddialog.c
index 3689dc16d00fbd3d232c7f233d39aa78b801505f..469cf52a3c4230eef362788eab10485e329c3355 100644
--- a/sflphone-client-gnome/src/config/zrtpadvanceddialog.c
+++ b/sflphone-client-gnome/src/config/zrtpadvanceddialog.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2009 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Pierre-Luc Bacon <pierre-luc.bacon@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,6 +15,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <zrtpadvanceddialog.h>
diff --git a/sflphone-client-gnome/src/config/zrtpadvanceddialog.h b/sflphone-client-gnome/src/config/zrtpadvanceddialog.h
index 23bfdbb8bcb246a9a42165e78ff899caa827e3df..c561d6a1f15f8e10167149ae91aa39e3f07e4678 100644
--- a/sflphone-client-gnome/src/config/zrtpadvanceddialog.h
+++ b/sflphone-client-gnome/src/config/zrtpadvanceddialog.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2009 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Pierre-Luc Bacon <pierre-luc.bacon@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,6 +15,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __SFL_ZRTP_ADVANCED_DIALOG__
diff --git a/sflphone-client-gnome/src/contacts/addressbook.c b/sflphone-client-gnome/src/contacts/addressbook.c
index dfa4df26b42c0cb271846b9c07b1400df58b7352..9c7e8d38b449dcc762d00d66dc0d4d320e7b4d65 100644
--- a/sflphone-client-gnome/src/contacts/addressbook.c
+++ b/sflphone-client-gnome/src/contacts/addressbook.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2009 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Julien Bonjean <julien.bonjean@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,6 +15,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <addressbook.h>
diff --git a/sflphone-client-gnome/src/contacts/addressbook.h b/sflphone-client-gnome/src/contacts/addressbook.h
index 08b79188d04c7836161d7557114b26a50d598638..f87f9dba19ec292e18783d5abf57650e4bf12aa3 100644
--- a/sflphone-client-gnome/src/contacts/addressbook.h
+++ b/sflphone-client-gnome/src/contacts/addressbook.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2009 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Julien Bonjean <julien.bonjean@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,6 +15,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
/**
diff --git a/sflphone-client-gnome/src/contacts/addressbook/eds.c b/sflphone-client-gnome/src/contacts/addressbook/eds.c
index 289e5aea7485b34346cee19bff43cc28d3dffcea..236235313ffeedc298d07a695b3e71f11f25f4e1 100644
--- a/sflphone-client-gnome/src/contacts/addressbook/eds.c
+++ b/sflphone-client-gnome/src/contacts/addressbook/eds.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2009 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Julien Bonjean <julien.bonjean@savoirfairelinux.com>
*
* File originally copied from evolution module of deskbar-applet 2.24.1
@@ -22,6 +22,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <glib.h>
diff --git a/sflphone-client-gnome/src/contacts/addressbook/eds.h b/sflphone-client-gnome/src/contacts/addressbook/eds.h
index 574cd941df84fa80e98d64fa01c26c5f01e85d8b..7ff8cbd025f27b28d19951a7b5f2411fcaf511cd 100644
--- a/sflphone-client-gnome/src/contacts/addressbook/eds.h
+++ b/sflphone-client-gnome/src/contacts/addressbook/eds.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2009 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Julien Bonjean <julien.bonjean@savoirfairelinux.com>
*
* File originally copied from evolution module of deskbar-applet 2.24.1
@@ -22,6 +22,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __EDS_H__
diff --git a/sflphone-client-gnome/src/contacts/calllist.c b/sflphone-client-gnome/src/contacts/calllist.c
index 09f428534830c87b3f8e76805075ec8775c4b779..c5566261be350aa45e96e6d2e2eab331874e8ab1 100644
--- a/sflphone-client-gnome/src/contacts/calllist.c
+++ b/sflphone-client-gnome/src/contacts/calllist.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2007 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Pierre-Luc Beaudoin <pierre-luc.beaudoin@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,6 +15,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <calllist.h>
diff --git a/sflphone-client-gnome/src/contacts/calllist.h b/sflphone-client-gnome/src/contacts/calllist.h
index befb97048e8a867298551eb1afb69a2a584678b7..db3cee03dcb4df6adc6685db1a8ffe234532530d 100644
--- a/sflphone-client-gnome/src/contacts/calllist.h
+++ b/sflphone-client-gnome/src/contacts/calllist.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2007 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Pierre-Luc Beaudoin <pierre-luc.beaudoin@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,6 +15,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __CALLLIST_H__
diff --git a/sflphone-client-gnome/src/contacts/calltab.c b/sflphone-client-gnome/src/contacts/calltab.c
index b8376f4a9cb7e99d5b7bab626bfeaa4f46567e2c..ac194bf8287fe4a233e827aae2d2c9acfc22afa8 100644
--- a/sflphone-client-gnome/src/contacts/calltab.c
+++ b/sflphone-client-gnome/src/contacts/calltab.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2007 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Antoine Reversat <antoine.reversat@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,6 +15,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <calltab.h>
diff --git a/sflphone-client-gnome/src/contacts/calltab.h b/sflphone-client-gnome/src/contacts/calltab.h
index bf3b11b8407efda3ab1e7a74c4ff9b3050279860..db14867ac51839ec0c3eb85c2bea116576fe69d5 100644
--- a/sflphone-client-gnome/src/contacts/calltab.h
+++ b/sflphone-client-gnome/src/contacts/calltab.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2007 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Antoine Reversat <antoine.reversat@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,6 +15,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __CALLTAB_H__
diff --git a/sflphone-client-gnome/src/contacts/calltree.c b/sflphone-client-gnome/src/contacts/calltree.c
index 3dde02cfbb62777677ad1fc0f24efab90360b493..dde1cae4c5e7345cf3c63ea8fadc546b0bc83c9b 100644
--- a/sflphone-client-gnome/src/contacts/calltree.c
+++ b/sflphone-client-gnome/src/contacts/calltree.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2007 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Pierre-Luc Beaudoin <pierre-luc.beaudoin@savoirfairelinux.com>
* Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
* Author: Alexandre Savard <alexandre.savard@savoirfairelinux.com>
@@ -17,6 +17,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <calltree.h>
diff --git a/sflphone-client-gnome/src/contacts/calltree.h b/sflphone-client-gnome/src/contacts/calltree.h
index fd6c33f455f321656d0f1e4e388b916274ef139c..c383caa9ed9ee6ee6abaaf305584fdc8c2a060b7 100644
--- a/sflphone-client-gnome/src/contacts/calltree.h
+++ b/sflphone-client-gnome/src/contacts/calltree.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2007 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Pierre-Luc Beaudoin <pierre-luc.beaudoin@savoirfairelinux.com>
* Author: Pierre-Luc Beaudoin <pierre-luc.beaudoin@savoirfairelinux.com>
*
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __CALLTREE_H__
diff --git a/sflphone-client-gnome/src/contacts/conferencelist.c b/sflphone-client-gnome/src/contacts/conferencelist.c
index 9dee60e481f979646486623414c20a86f5122d42..42216fdcd0c6427457b1b34f7d22df3603829702 100644
--- a/sflphone-client-gnome/src/contacts/conferencelist.c
+++ b/sflphone-client-gnome/src/contacts/conferencelist.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2007 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Alexandre Savard <alexandre.savard@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,6 +15,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <conferencelist.h>
diff --git a/sflphone-client-gnome/src/contacts/conferencelist.h b/sflphone-client-gnome/src/contacts/conferencelist.h
index 4836914f7a36008731935531366542eb2c1ce6f2..2652b892b7aba376bd1692224a8eafa3741f0bdc 100644
--- a/sflphone-client-gnome/src/contacts/conferencelist.h
+++ b/sflphone-client-gnome/src/contacts/conferencelist.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2009 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Alexandre Savard <alexandre.savard@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,6 +15,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __CONFERENCELIST_H__
diff --git a/sflphone-client-gnome/src/contacts/history.c b/sflphone-client-gnome/src/contacts/history.c
index 5aa5010d2ad86f410cd11246d3f6f59c93db83f4..f354e73ceef65f5946a4b8386f4f68373d41c907 100644
--- a/sflphone-client-gnome/src/contacts/history.c
+++ b/sflphone-client-gnome/src/contacts/history.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2009 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Julien Bonjean <julien.bonjean@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,6 +15,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <history.h>
diff --git a/sflphone-client-gnome/src/contacts/history.h b/sflphone-client-gnome/src/contacts/history.h
index 34eaaafbfbb0bdfbdd7034c313d612cd1260020d..f91393ccb1316d1da74bb171b7e8d7c2d5595ee8 100644
--- a/sflphone-client-gnome/src/contacts/history.h
+++ b/sflphone-client-gnome/src/contacts/history.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2009 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Julien Bonjean <julien.bonjean@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,6 +15,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
/**
diff --git a/sflphone-client-gnome/src/contacts/searchbar.c b/sflphone-client-gnome/src/contacts/searchbar.c
index d84c6efcc4e6c168371daa1cec5fc0bbe7a9aff5..09e2da62e4f79badf94d55b9010b7aeed909b3cf 100644
--- a/sflphone-client-gnome/src/contacts/searchbar.c
+++ b/sflphone-client-gnome/src/contacts/searchbar.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008 2009 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
*
* Author: Antoine Reversat <antoine.reversat@savoirfairelinux.com>
* Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
@@ -18,6 +18,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <searchbar.h>
diff --git a/sflphone-client-gnome/src/contacts/searchbar.h b/sflphone-client-gnome/src/contacts/searchbar.h
index 8354dac96a1905b19667191181dbe9e83ff0623d..f1464cd554a2d1385fa5bcfafab0d3faf1d5cfd9 100644
--- a/sflphone-client-gnome/src/contacts/searchbar.h
+++ b/sflphone-client-gnome/src/contacts/searchbar.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008 2009 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
*
* Author: Antoine Reversat <antoine.reversat@savoirfairelinux.com>
* Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
@@ -18,6 +18,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
/**
diff --git a/sflphone-client-gnome/src/dbus/dbus.c b/sflphone-client-gnome/src/dbus/dbus.c
index 08cf832c4cc3f4856ea5b334896303215cc5a9d8..8e5cd1d18b0116dc581cc3d9ac90b1697cefaa38 100644
--- a/sflphone-client-gnome/src/dbus/dbus.c
+++ b/sflphone-client-gnome/src/dbus/dbus.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2007 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Pierre-Luc Beaudoin <pierre-luc.beaudoin@savoirfairelinux.com>
* Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
* Author: Guillaume Carmel-Archambault <guillaume.carmel-archambault@savoirfairelinux.com>
@@ -17,6 +17,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <config.h>
diff --git a/sflphone-client-gnome/src/dbus/dbus.h b/sflphone-client-gnome/src/dbus/dbus.h
index 80d99f19619f7d3ce4705dc897119fffadb550e4..cf75d9ce98095092c525900676d5e20a1a05f606 100644
--- a/sflphone-client-gnome/src/dbus/dbus.h
+++ b/sflphone-client-gnome/src/dbus/dbus.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2007 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Pierre-Luc Beaudoin <pierre-luc.beaudoin@savoirfairelinux.com>
* Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
* Author: Guillaume Carmel-Archambault <guillaume.carmel-archambault@savoirfairelinux.com>
@@ -17,9 +17,19 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
-
#ifndef __DBUS_H__
#define __DBUS_H__
diff --git a/sflphone-client-gnome/src/dialpad.c b/sflphone-client-gnome/src/dialpad.c
index eac32604bf947aaa0a77affb093fee95879133fe..31ed1374132a772d02195a4d732c7f30ca195f8b 100644
--- a/sflphone-client-gnome/src/dialpad.c
+++ b/sflphone-client-gnome/src/dialpad.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2007 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Pierre-Luc Beaudoin <pierre-luc.beaudoin@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,6 +15,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <dialpad.h>
diff --git a/sflphone-client-gnome/src/dialpad.h b/sflphone-client-gnome/src/dialpad.h
index 2a87148b3b9f12efb53c8865b557d151d4d1b005..c95f5caf55541fd8db6fe6e4152c35db652fc945 100644
--- a/sflphone-client-gnome/src/dialpad.h
+++ b/sflphone-client-gnome/src/dialpad.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2007 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Pierre-Luc Beaudoin <pierre-luc.beaudoin@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,6 +15,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __DIALPAD_H__
diff --git a/sflphone-client-gnome/src/errors.c b/sflphone-client-gnome/src/errors.c
index d9f933ce78ef7a29dd343af5fe362788a419b024..0dbd1240014d8d810155b4484213bb4f06cfc989 100644
--- a/sflphone-client-gnome/src/errors.c
+++ b/sflphone-client-gnome/src/errors.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,6 +15,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <errors.h>
diff --git a/sflphone-client-gnome/src/errors.h b/sflphone-client-gnome/src/errors.h
index 7c4eed2a0f0b9b5cd241768777444442d8729a92..2c87178ff3c020408fa40a1f9ab524c1167e5a86 100644
--- a/sflphone-client-gnome/src/errors.h
+++ b/sflphone-client-gnome/src/errors.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,6 +15,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __ERRORS_H
diff --git a/sflphone-client-gnome/src/icons/icon_factory.c b/sflphone-client-gnome/src/icons/icon_factory.c
index 3598e3510f67558c073f169eb285e866b8f3a678..c18e038b0ae7346607cd8885c692e2001ab39215 100644
--- a/sflphone-client-gnome/src/icons/icon_factory.c
+++ b/sflphone-client-gnome/src/icons/icon_factory.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2009 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,6 +15,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include "icon_factory.h"
diff --git a/sflphone-client-gnome/src/icons/icon_factory.h b/sflphone-client-gnome/src/icons/icon_factory.h
index 557f8f92b484e60798f86394e0b8a5d44f606815..6392832ac6515ae1ee9c640c92f03040ec1a6683 100644
--- a/sflphone-client-gnome/src/icons/icon_factory.h
+++ b/sflphone-client-gnome/src/icons/icon_factory.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2009 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,6 +15,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef ICON_FACTORY_H
diff --git a/sflphone-client-gnome/src/icons/pixmap_data.h b/sflphone-client-gnome/src/icons/pixmap_data.h
index 95b215c6c53caf5655d80dd6fd06c55fe67462ca..ce8fcc648c82673ca20b783dda03d1bdef575f04 100644
--- a/sflphone-client-gnome/src/icons/pixmap_data.h
+++ b/sflphone-client-gnome/src/icons/pixmap_data.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2009 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,6 +15,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef PIXMAP_DATA_H
diff --git a/sflphone-client-gnome/src/main.c b/sflphone-client-gnome/src/main.c
index 1d656b8f85f75128bdab778290f77ad46200ec39..6ab9d8c8329698041ee2e5b4144393ec7ae11d87 100644
--- a/sflphone-client-gnome/src/main.c
+++ b/sflphone-client-gnome/src/main.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2007 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Pierre-Luc Beaudoin <pierre-luc.beaudoin@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,6 +15,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <actions.h>
@@ -76,11 +87,19 @@ main (int argc, char *argv[])
gtk_init (&argc, &argv);
g_print ("%s %s\n", PACKAGE, VERSION);
- g_print ("Copyright (c) 2005 2006 2007 2008 2009 Savoir-faire Linux Inc.\n");
- g_print (
- "This is free software. You may redistribute copies of it under the terms of\n\
-the GNU General Public License Version 3 <http://www.gnu.org/licenses/gpl.html>.\n\
-There is NO WARRANTY, to the extent permitted by law.\n\n");
+ g_print ("\nCopyright (c) 2005 2006 2007 2008 2009 2010 Savoir-faire Linux Inc.\n\n");
+ g_print ("This is free software. You may redistribute copies of it under the terms of\n" \
+ "the GNU General Public License Version 3 <http://www.gnu.org/licenses/gpl.html>.\n" \
+ "There is NO WARRANTY, to the extent permitted by law.\n\n" \
+ "Additional permission under GNU GPL version 3 section 7:\n\n" \
+ "If you modify this program, or any covered work, by linking or\n" \
+ "combining it with the OpenSSL project's OpenSSL library (or a\n" \
+ "modified version of that library), containing parts covered by the\n" \
+ "terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.\n" \
+ "grants you additional permission to convey the resulting work.\n" \
+ "Corresponding Source for a non-source form of such a combination\n" \
+ "shall include the source code for the parts of OpenSSL used as well\n" \
+ "as that of the covered work.\n\n");
DEBUG("Logging Started");
diff --git a/sflphone-client-gnome/src/mainwindow.c b/sflphone-client-gnome/src/mainwindow.c
index 597076303dabc17b65fd6bfccd5f736f9ac710f1..81fbe51c51167aeb705227f8fba2af19a6e6e3da 100644
--- a/sflphone-client-gnome/src/mainwindow.c
+++ b/sflphone-client-gnome/src/mainwindow.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2007 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
* Author: Pierre-Luc Beaudoin <pierre-luc.beaudoin@savoirfairelinux.com>
* Author: Pierre-Luc Bacon <pierre-luc.bacon@savoirfairelinux.com>
@@ -17,6 +17,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <config.h>
diff --git a/sflphone-client-gnome/src/mainwindow.h b/sflphone-client-gnome/src/mainwindow.h
index 98806a527d27732ce5fb3a0b0952dd404b133cc5..db7007cd3c315733710fa8c4ab9c2ebf00ee8887 100644
--- a/sflphone-client-gnome/src/mainwindow.h
+++ b/sflphone-client-gnome/src/mainwindow.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2007 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Pierre-Luc Beaudoin <pierre-luc.beaudoin@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,6 +15,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __MAINWINDOW_H__
diff --git a/sflphone-client-gnome/src/reqaccount.c b/sflphone-client-gnome/src/reqaccount.c
index cfd55fefcc89313756b3dead8043d619d6327d1d..dda30b8dc6b2e549bd081e1b3340d291ddc822e0 100644
--- a/sflphone-client-gnome/src/reqaccount.c
+++ b/sflphone-client-gnome/src/reqaccount.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2009 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author Jean Schurger <jean.schurger@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,6 +15,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
/*
diff --git a/sflphone-client-gnome/src/reqaccount.h b/sflphone-client-gnome/src/reqaccount.h
index 9ff07f26e0132a9c107054454dd3662b20df47cf..3a17154a4b07c7885f268dc56bf88604e39f4c0c 100644
--- a/sflphone-client-gnome/src/reqaccount.h
+++ b/sflphone-client-gnome/src/reqaccount.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2009 Savoir-faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author Jean Schurger <jean.schurger@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,6 +15,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
typedef struct {
diff --git a/sflphone-client-gnome/src/sflnotify.c b/sflphone-client-gnome/src/sflnotify.c
index ab1ccabe5a9cbdf9d0e0c373a1c10fc3f48820a8..5ac960e0035e7a08de0eddfed880998281e3b8b7 100644
--- a/sflphone-client-gnome/src/sflnotify.c
+++ b/sflphone-client-gnome/src/sflnotify.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,6 +15,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <sflnotify.h>
diff --git a/sflphone-client-gnome/src/sflnotify.h b/sflphone-client-gnome/src/sflnotify.h
index 69d686dd55afcff73cbcd63be20f93b14de034eb..71cfc916658ef94a196d8c9f5d2d2e2a9181e732 100644
--- a/sflphone-client-gnome/src/sflnotify.h
+++ b/sflphone-client-gnome/src/sflnotify.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,6 +15,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __GNOME_NOTIFICATION_H__
diff --git a/sflphone-client-gnome/src/sflphone_const.h b/sflphone-client-gnome/src/sflphone_const.h
index 98d73970962bf20a2d97a8e9e352b2aa02258224..5a63a80bac069cfe6404b37824e3e8f21d96f91b 100644
--- a/sflphone-client-gnome/src/sflphone_const.h
+++ b/sflphone-client-gnome/src/sflphone_const.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,6 +15,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __SFLPHONE_CONST_H
diff --git a/sflphone-client-gnome/src/shortcuts.c b/sflphone-client-gnome/src/shortcuts.c
index 7dfd53173b606a561fa5c176a57f9d5cff23bd3b..4ecb7cd47bde7bb23f2f793d999e7f2eea9a04c2 100644
--- a/sflphone-client-gnome/src/shortcuts.c
+++ b/sflphone-client-gnome/src/shortcuts.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2010 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Julien Bonjean <julien.bonjean@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,6 +15,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <string.h>
diff --git a/sflphone-client-gnome/src/shortcuts.h b/sflphone-client-gnome/src/shortcuts.h
index 3bc1a44cdb77c46b7929adf38197c169d588e63f..47f8fec550dc48ba8ad083994b1e17c78f9810a2 100644
--- a/sflphone-client-gnome/src/shortcuts.h
+++ b/sflphone-client-gnome/src/shortcuts.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2010 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Julien Bonjean <julien.bonjean@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,6 +15,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef SHORTCUTS_H_
diff --git a/sflphone-client-gnome/src/sliders.c b/sflphone-client-gnome/src/sliders.c
index 5d9acc01e59574e60d6bd9aa9614e6ca1dae7608..65e393c8e787ed1ccb7a22d4377d41d9fd730da3 100644
--- a/sflphone-client-gnome/src/sliders.c
+++ b/sflphone-client-gnome/src/sliders.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2007 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Pierre-Luc Beaudoin <pierre-luc.beaudoin@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,6 +15,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <sliders.h>
diff --git a/sflphone-client-gnome/src/sliders.h b/sflphone-client-gnome/src/sliders.h
index 1e517cb9763ceace5265519a6e68c3a4b5ac1685..531a1b22bd9a435e967c270efb39704fd02c7c15 100644
--- a/sflphone-client-gnome/src/sliders.h
+++ b/sflphone-client-gnome/src/sliders.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2007 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Pierre-Luc Beaudoin <pierre-luc.beaudoin@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,6 +15,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __SLIDERS_H__
diff --git a/sflphone-client-gnome/src/statusicon.c b/sflphone-client-gnome/src/statusicon.c
index 0808f1a2be5b40815a0d03fcf9593dd231560621..6ad61747705578cb9e360a4496bafe27b7a8e0b7 100644
--- a/sflphone-client-gnome/src/statusicon.c
+++ b/sflphone-client-gnome/src/statusicon.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2007 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Pierre-Luc Beaudoin <pierre-luc.beaudoin@savoirfairelinux.com>
* Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
*
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <gtk/gtk.h>
diff --git a/sflphone-client-gnome/src/statusicon.h b/sflphone-client-gnome/src/statusicon.h
index fc45eeec5b12555a4e1de3f030fccb55c2320f45..ad9303d360ade39150b5b4dcbccc34ecdcb2c714 100644
--- a/sflphone-client-gnome/src/statusicon.h
+++ b/sflphone-client-gnome/src/statusicon.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2007 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Pierre-Luc Beaudoin <pierre-luc.beaudoin@savoirfairelinux.com>
* Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
*
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __STATUSICON_H__
diff --git a/sflphone-client-gnome/src/toolbar.c b/sflphone-client-gnome/src/toolbar.c
index bf71aa1e8c66def3e25c48886b11966b70c392a9..1a26642eb7e44af5eda079ce1503252462b36c89 100644
--- a/sflphone-client-gnome/src/toolbar.c
+++ b/sflphone-client-gnome/src/toolbar.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2009 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Julien Bonjean <julien.bonjean@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,6 +15,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <toolbar.h>
diff --git a/sflphone-client-gnome/src/toolbar.h b/sflphone-client-gnome/src/toolbar.h
index ddd3b3a1148432ef31f1b9edb45bfd2d4112cb84..7b45e81273a37cd707e91bca92972cc97dbbcb8e 100644
--- a/sflphone-client-gnome/src/toolbar.h
+++ b/sflphone-client-gnome/src/toolbar.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2009 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Julien Bonjean <julien.bonjean@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,6 +15,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __TOOLBAR_H__
diff --git a/sflphone-client-gnome/src/uimanager.c b/sflphone-client-gnome/src/uimanager.c
index a866c3c1a969295836c2188b4082fd01d378efe1..46def19d3dfd989a233936dede77091f7a298a79 100644
--- a/sflphone-client-gnome/src/uimanager.c
+++ b/sflphone-client-gnome/src/uimanager.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2009 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Pierre-Luc Bacon <pierre-luc.bacon@savoirfairelinux.com
*
* This program is free software; you can redistribute it and/or modify
@@ -15,6 +15,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <config.h>
diff --git a/sflphone-client-gnome/src/uimanager.h b/sflphone-client-gnome/src/uimanager.h
index c42bf1aa04d769bfb34ff2eeceb846231fada3a7..23bebef995e10ce8406c2fa82853faf2dbc62b8d 100644
--- a/sflphone-client-gnome/src/uimanager.h
+++ b/sflphone-client-gnome/src/uimanager.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2009 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,6 +15,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef UI_MANAGER_H
diff --git a/sflphone-client-gnome/tests/check_config.c b/sflphone-client-gnome/tests/check_config.c
index ae41e1a280ff24bb365fe43a93e064c85b609049..92fd44f14aa70a304c702a6c6e1ade76c33b2417 100644
--- a/sflphone-client-gnome/tests/check_config.c
+++ b/sflphone-client-gnome/tests/check_config.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2009 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Julien Bonjean <julien.bonjean@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,6 +15,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <check.h>
diff --git a/sflphone-client-gnome/tests/check_contacts.c b/sflphone-client-gnome/tests/check_contacts.c
index 193cab4b8fb99bd4591487ea188a729523aa9563..6aed2872291b4b6216cdff48ab50bc130f27870f 100644
--- a/sflphone-client-gnome/tests/check_contacts.c
+++ b/sflphone-client-gnome/tests/check_contacts.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2009 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Julien Bonjean <julien.bonjean@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,6 +15,15 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <check.h>
diff --git a/sflphone-client-gnome/tests/check_dbus.c b/sflphone-client-gnome/tests/check_dbus.c
index ef7fc2a6f9ff72cae072ab0d275603b901656dbc..902127bb5963029b9d234cc626385863f03973fd 100644
--- a/sflphone-client-gnome/tests/check_dbus.c
+++ b/sflphone-client-gnome/tests/check_dbus.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2009 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Julien Bonjean <julien.bonjean@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,6 +15,15 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <check.h>
diff --git a/sflphone-client-gnome/tests/check_global.c b/sflphone-client-gnome/tests/check_global.c
index 5ba1256895d63a31eac550ff920506d1fdc9fa08..c1197673daeec0091e23eef129b4394bf5d34eb8 100644
--- a/sflphone-client-gnome/tests/check_global.c
+++ b/sflphone-client-gnome/tests/check_global.c
@@ -1,4 +1,5 @@
/*
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Copyright (C) 2009 Savoir-Faire Linux inc.
* Author: Julien Bonjean <julien.bonjean@savoirfairelinux.com>
*
@@ -15,6 +16,15 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <check.h>
diff --git a/sflphone-common/README b/sflphone-common/README
index f32d8767a3f924e10b8707626b6cfe85f8da5d44..264dfc51f793e2fbb1c5d0b08177c9979453fed9 100644
--- a/sflphone-common/README
+++ b/sflphone-common/README
@@ -1,11 +1,10 @@
-This is SFLphone, release 0.9.6
+COPYRIGHT NOTICE
-Copyright (c) Savoir-faire Linux, Inc 2004-2009
- <sflphoneteam@savoirfairelinux.com>
+Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
-This program is free software; you can redistribute it and/or modify
+This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 3 of the License, or
+the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
@@ -14,8 +13,18 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+Additional permission under GNU GPL version 3 section 7:
+
+If you modify this program, or any covered work, by linking or
+combining it with the OpenSSL project's OpenSSL library (or a
+modified version of that library), containing parts covered by the
+terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+grants you additional permission to convey the resulting work.
+Corresponding Source for a non-source form of such a combination
+shall include the source code for the parts of OpenSSL used as well
+as that of the covered work.
Introduction
diff --git a/sflphone-common/VERSION b/sflphone-common/VERSION
index e47b076695b64621ec5c2f3985f6a9ddbc81c520..e3e180701e2ae694f8818779c4e28321a6b11b32 100644
--- a/sflphone-common/VERSION
+++ b/sflphone-common/VERSION
@@ -1 +1 @@
-0.9.8~rc1
+0.9.8
diff --git a/sflphone-common/configure.ac b/sflphone-common/configure.ac
index 504f6d8cebe783ab307e1a93e8582196470aa919..36aaffefb855b07ec44c3853b3f5c137b418d34d 100644
--- a/sflphone-common/configure.ac
+++ b/sflphone-common/configure.ac
@@ -4,7 +4,7 @@ dnl
dnl Process this file with autoconf to produce a configure script.
AC_PREREQ(2.59)
AC_INIT([sflphone],[0.9.8~rc1],[sflphoneteam@savoirfairelinux.com],[sflphone])
- AC_COPYRIGHT([[Copyright (c) Savoir-Faire Linux 2004-2009]])
+ AC_COPYRIGHT([[Copyright (c) Savoir-Faire Linux 2004, 2005, 2006, 2007, 2008, 2009, 2010]])
AC_REVISION([$Revision$])
AC_CANONICAL_SYSTEM
diff --git a/sflphone-common/libs/pjproject/aconfigure b/sflphone-common/libs/pjproject/aconfigure
index e5b8e4aec50cfe5594027fef1b4e412fb26dc834..fbcf29c80a8ab4dad98f75dd209c455890b80496 100755
--- a/sflphone-common/libs/pjproject/aconfigure
+++ b/sflphone-common/libs/pjproject/aconfigure
@@ -5368,8 +5368,11 @@ if test "${enable_g7221_codec+set}" = set; then :
$as_echo "Checking if G.722.1 codec is disabled...yes" >&6; }
fi
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: Checking if G.722.1 codec is disabled...no" >&5
-$as_echo "Checking if G.722.1 codec is disabled...no" >&6; }
+ ac_no_g7221_codec=1
+ $as_echo "#define PJMEDIA_HAS_G7221_CODEC 0" >>confdefs.h
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: Checking if G.722.1 codec is disabled...yes" >&5
+$as_echo "Checking if G.722.1 codec is disabled...yes" >&6; }
fi
diff --git a/sflphone-common/libs/pjproject/aconfigure.ac b/sflphone-common/libs/pjproject/aconfigure.ac
index 92eaa9dcb2d13cf0791e3cb1f753fa7c1c7c0ece..e903d90fb1af75c21dcf42f8494596b783b73d07 100644
--- a/sflphone-common/libs/pjproject/aconfigure.ac
+++ b/sflphone-common/libs/pjproject/aconfigure.ac
@@ -544,7 +544,9 @@ AC_ARG_ENABLE(g7221-codec,
AC_DEFINE(PJMEDIA_HAS_G7221_CODEC,0)
AC_MSG_RESULT([Checking if G.722.1 codec is disabled...yes])
fi],
- AC_MSG_RESULT([Checking if G.722.1 codec is disabled...no]))
+ [ac_no_g7221_codec=1]
+ AC_DEFINE(PJMEDIA_HAS_G7221_CODEC,0)
+ AC_MSG_RESULT([Checking if G.722.1 codec is disabled...yes]))
dnl # Include Speex codec
AC_SUBST(ac_no_speex_codec)
diff --git a/sflphone-common/libs/pjproject/pjlib-util/include/pjlib-util.h b/sflphone-common/libs/pjproject/pjlib-util/include/pjlib-util.h
index d8523abc1a9e5aebaf313c9fb11388cefd90a8ff..cf5d825cb925b1fcef331454c9f0217fed5cff32 100644
--- a/sflphone-common/libs/pjproject/pjlib-util/include/pjlib-util.h
+++ b/sflphone-common/libs/pjproject/pjlib-util/include/pjlib-util.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJLIB_UTIL_H__
#define __PJLIB_UTIL_H__
diff --git a/sflphone-common/libs/pjproject/pjlib-util/include/pjlib-util/base64.h b/sflphone-common/libs/pjproject/pjlib-util/include/pjlib-util/base64.h
index d2339a567182d42598f622de507dfb8fffad09d5..a4429e0534a2ff738a6a3d9ee06423628e52956c 100644
--- a/sflphone-common/libs/pjproject/pjlib-util/include/pjlib-util/base64.h
+++ b/sflphone-common/libs/pjproject/pjlib-util/include/pjlib-util/base64.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJLIB_UTIL_BASE64_H__
#define __PJLIB_UTIL_BASE64_H__
diff --git a/sflphone-common/libs/pjproject/pjlib-util/include/pjlib-util/config.h b/sflphone-common/libs/pjproject/pjlib-util/include/pjlib-util/config.h
index f1e5b1e9937d7317795ef6342d8fed0efea112aa..7b09e23d4e61573727e72bfcd51748a3ccac2013 100644
--- a/sflphone-common/libs/pjproject/pjlib-util/include/pjlib-util/config.h
+++ b/sflphone-common/libs/pjproject/pjlib-util/include/pjlib-util/config.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJLIB_UTIL_CONFIG_H__
#define __PJLIB_UTIL_CONFIG_H__
diff --git a/sflphone-common/libs/pjproject/pjlib-util/include/pjlib-util/crc32.h b/sflphone-common/libs/pjproject/pjlib-util/include/pjlib-util/crc32.h
index d63db872c47fc9d0c8f723b3d7823b99621c1a60..8e8e65dc020cf945a6152c0ee37959cbba80057e 100644
--- a/sflphone-common/libs/pjproject/pjlib-util/include/pjlib-util/crc32.h
+++ b/sflphone-common/libs/pjproject/pjlib-util/include/pjlib-util/crc32.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJLIB_UTIL_CRC32_H__
#define __PJLIB_UTIL_CRC32_H__
diff --git a/sflphone-common/libs/pjproject/pjlib-util/include/pjlib-util/dns.h b/sflphone-common/libs/pjproject/pjlib-util/include/pjlib-util/dns.h
index 3aba6258f0b716e043235635ef111e9060159f4e..f36774e1b054afbd93d5c8b444864daf25a8ec30 100644
--- a/sflphone-common/libs/pjproject/pjlib-util/include/pjlib-util/dns.h
+++ b/sflphone-common/libs/pjproject/pjlib-util/include/pjlib-util/dns.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJLIB_UTIL_DNS_H__
#define __PJLIB_UTIL_DNS_H__
diff --git a/sflphone-common/libs/pjproject/pjlib-util/include/pjlib-util/dns_server.h b/sflphone-common/libs/pjproject/pjlib-util/include/pjlib-util/dns_server.h
index 0dbe531177f7169aa43e16a8d5d4d98b64be8f39..2e6af8359e32643365ff5631640835aeb6b9c7e6 100644
--- a/sflphone-common/libs/pjproject/pjlib-util/include/pjlib-util/dns_server.h
+++ b/sflphone-common/libs/pjproject/pjlib-util/include/pjlib-util/dns_server.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJLIB_UTIL_DNS_SERVER_H__
#define __PJLIB_UTIL_DNS_SERVER_H__
diff --git a/sflphone-common/libs/pjproject/pjlib-util/include/pjlib-util/errno.h b/sflphone-common/libs/pjproject/pjlib-util/include/pjlib-util/errno.h
index 11375c78f42a4ad6168bec95027811cfd023c928..88e43be10df331ac0b088ae21b35bb93548e654a 100644
--- a/sflphone-common/libs/pjproject/pjlib-util/include/pjlib-util/errno.h
+++ b/sflphone-common/libs/pjproject/pjlib-util/include/pjlib-util/errno.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJLIB_UTIL_ERRNO_H__
#define __PJLIB_UTIL_ERRNO_H__
diff --git a/sflphone-common/libs/pjproject/pjlib-util/include/pjlib-util/hmac_md5.h b/sflphone-common/libs/pjproject/pjlib-util/include/pjlib-util/hmac_md5.h
index a5e36fc465431cc54f892fec7591a0eaf3a856f5..8c90ac60ad58eca0c1dd9b2ea0108b0c65276680 100644
--- a/sflphone-common/libs/pjproject/pjlib-util/include/pjlib-util/hmac_md5.h
+++ b/sflphone-common/libs/pjproject/pjlib-util/include/pjlib-util/hmac_md5.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJLIB_UTIL_HMAC_MD5_H__
#define __PJLIB_UTIL_HMAC_MD5_H__
diff --git a/sflphone-common/libs/pjproject/pjlib-util/include/pjlib-util/hmac_sha1.h b/sflphone-common/libs/pjproject/pjlib-util/include/pjlib-util/hmac_sha1.h
index 5300eea0415f962448843052c8a4742afe479985..036b7de46959752e61ad9bbe2a914066da9be7eb 100644
--- a/sflphone-common/libs/pjproject/pjlib-util/include/pjlib-util/hmac_sha1.h
+++ b/sflphone-common/libs/pjproject/pjlib-util/include/pjlib-util/hmac_sha1.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJLIB_UTIL_HMAC_SHA1_H__
#define __PJLIB_UTIL_HMAC_SHA1_H__
diff --git a/sflphone-common/libs/pjproject/pjlib-util/include/pjlib-util/md5.h b/sflphone-common/libs/pjproject/pjlib-util/include/pjlib-util/md5.h
index 5fd90c0a2627f294440c9a07c247cfbb1965d051..984cb6228c8c39aa7ecc076754fd96bb39a49403 100644
--- a/sflphone-common/libs/pjproject/pjlib-util/include/pjlib-util/md5.h
+++ b/sflphone-common/libs/pjproject/pjlib-util/include/pjlib-util/md5.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJLIB_UTIL_MD5_H__
#define __PJLIB_UTIL_MD5_H__
diff --git a/sflphone-common/libs/pjproject/pjlib-util/include/pjlib-util/pcap.h b/sflphone-common/libs/pjproject/pjlib-util/include/pjlib-util/pcap.h
index fb0a3252c20368bc7496142a7c4ea95ef9fc40ae..e0cc49211c95a84b1ee2962719a4dee29752e81d 100644
--- a/sflphone-common/libs/pjproject/pjlib-util/include/pjlib-util/pcap.h
+++ b/sflphone-common/libs/pjproject/pjlib-util/include/pjlib-util/pcap.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJLIB_UTIL_PCAP_H__
#define __PJLIB_UTIL_PCAP_H__
diff --git a/sflphone-common/libs/pjproject/pjlib-util/include/pjlib-util/resolver.h b/sflphone-common/libs/pjproject/pjlib-util/include/pjlib-util/resolver.h
index 2a82b2bc64024145a0a3cc1a88680caf7d388199..94c4f7ba8944d590e17941fffef09b3ad6549fc0 100644
--- a/sflphone-common/libs/pjproject/pjlib-util/include/pjlib-util/resolver.h
+++ b/sflphone-common/libs/pjproject/pjlib-util/include/pjlib-util/resolver.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJLIB_UTIL_RESOLVER_H__
#define __PJLIB_UTIL_RESOLVER_H__
diff --git a/sflphone-common/libs/pjproject/pjlib-util/include/pjlib-util/scanner.h b/sflphone-common/libs/pjproject/pjlib-util/include/pjlib-util/scanner.h
index ef428523b996a5bacddda8fb6238575c19e93dd4..948e6c5f3ae33bc9eeb654f74483be1e8186b76f 100644
--- a/sflphone-common/libs/pjproject/pjlib-util/include/pjlib-util/scanner.h
+++ b/sflphone-common/libs/pjproject/pjlib-util/include/pjlib-util/scanner.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJ_SCANNER_H__
#define __PJ_SCANNER_H__
diff --git a/sflphone-common/libs/pjproject/pjlib-util/include/pjlib-util/scanner_cis_bitwise.h b/sflphone-common/libs/pjproject/pjlib-util/include/pjlib-util/scanner_cis_bitwise.h
index 8f6a3ce6074ae2ad28edea3e8455b92c3d8277e4..6d6afc41fad753d84863a50b9f77adfadd4b37fc 100644
--- a/sflphone-common/libs/pjproject/pjlib-util/include/pjlib-util/scanner_cis_bitwise.h
+++ b/sflphone-common/libs/pjproject/pjlib-util/include/pjlib-util/scanner_cis_bitwise.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJLIB_UTIL_SCANNER_CIS_BIT_H__
#define __PJLIB_UTIL_SCANNER_CIS_BIT_H__
diff --git a/sflphone-common/libs/pjproject/pjlib-util/include/pjlib-util/scanner_cis_uint.h b/sflphone-common/libs/pjproject/pjlib-util/include/pjlib-util/scanner_cis_uint.h
index 1a2532ebad85bb9d41934cd5115ee140dde1793a..3097c3eb4035b222ff3b7f5d40db9311d0653063 100644
--- a/sflphone-common/libs/pjproject/pjlib-util/include/pjlib-util/scanner_cis_uint.h
+++ b/sflphone-common/libs/pjproject/pjlib-util/include/pjlib-util/scanner_cis_uint.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJLIB_UTIL_SCANNER_CIS_BIT_H__
#define __PJLIB_UTIL_SCANNER_CIS_BIT_H__
diff --git a/sflphone-common/libs/pjproject/pjlib-util/include/pjlib-util/sha1.h b/sflphone-common/libs/pjproject/pjlib-util/include/pjlib-util/sha1.h
index 93a2a286cf1d9bb3e24ffd6ec68bf6df49a61b59..2db01872b5a22e082b0c6ec2f0d35fc0dfc2ca82 100644
--- a/sflphone-common/libs/pjproject/pjlib-util/include/pjlib-util/sha1.h
+++ b/sflphone-common/libs/pjproject/pjlib-util/include/pjlib-util/sha1.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJLIB_UTIL_SHA1_H__
#define __PJLIB_UTIL_SHA1_H__
diff --git a/sflphone-common/libs/pjproject/pjlib-util/include/pjlib-util/srv_resolver.h b/sflphone-common/libs/pjproject/pjlib-util/include/pjlib-util/srv_resolver.h
index d1a292f1f61aca71fc200d9d3c4feedba19685b1..a624dcb14742ec205bad74e97e39ee2051891518 100644
--- a/sflphone-common/libs/pjproject/pjlib-util/include/pjlib-util/srv_resolver.h
+++ b/sflphone-common/libs/pjproject/pjlib-util/include/pjlib-util/srv_resolver.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJLIB_UTIL_SRV_RESOLVER_H__
#define __PJLIB_UTIL_SRV_RESOLVER_H__
diff --git a/sflphone-common/libs/pjproject/pjlib-util/include/pjlib-util/string.h b/sflphone-common/libs/pjproject/pjlib-util/include/pjlib-util/string.h
index 20bac690932f62a182ff8170e11e44d9f9791433..e18e20fc1e253b8f4f22025982072fbd594d66d9 100644
--- a/sflphone-common/libs/pjproject/pjlib-util/include/pjlib-util/string.h
+++ b/sflphone-common/libs/pjproject/pjlib-util/include/pjlib-util/string.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJLIB_UTIL_STRING_H__
#define __PJLIB_UTIL_STRING_H__
diff --git a/sflphone-common/libs/pjproject/pjlib-util/include/pjlib-util/stun_simple.h b/sflphone-common/libs/pjproject/pjlib-util/include/pjlib-util/stun_simple.h
index f95bb3f33595e9676ec6c6102775b12e72232b20..b33e5d8472690318d5d0825e7c101c922b8992b3 100644
--- a/sflphone-common/libs/pjproject/pjlib-util/include/pjlib-util/stun_simple.h
+++ b/sflphone-common/libs/pjproject/pjlib-util/include/pjlib-util/stun_simple.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJSTUN_H__
#define __PJSTUN_H__
diff --git a/sflphone-common/libs/pjproject/pjlib-util/include/pjlib-util/types.h b/sflphone-common/libs/pjproject/pjlib-util/include/pjlib-util/types.h
index 1147e251dc889c3a7fa88932a1bbadcaf43cd27b..365288e3608635027382e5c33260bf23c007b391 100644
--- a/sflphone-common/libs/pjproject/pjlib-util/include/pjlib-util/types.h
+++ b/sflphone-common/libs/pjproject/pjlib-util/include/pjlib-util/types.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJLIB_UTIL_TYPES_H__
#define __PJLIB_UTIL_TYPES_H__
diff --git a/sflphone-common/libs/pjproject/pjlib-util/include/pjlib-util/xml.h b/sflphone-common/libs/pjproject/pjlib-util/include/pjlib-util/xml.h
index 776e2987d064d92d33dee4478c30e58250008371..e42ca4d0b8dc9513167247b5c754aacb3cf8f524 100644
--- a/sflphone-common/libs/pjproject/pjlib-util/include/pjlib-util/xml.h
+++ b/sflphone-common/libs/pjproject/pjlib-util/include/pjlib-util/xml.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJ_XML_H__
#define __PJ_XML_H__
diff --git a/sflphone-common/libs/pjproject/pjlib-util/src/pjlib-util-test/encryption.c b/sflphone-common/libs/pjproject/pjlib-util/src/pjlib-util-test/encryption.c
index 6dbaf37379303c6861bd7df66bd65e0c2d683bb0..827adf3867d2100702f91150b461cd22ff0cfdf2 100644
--- a/sflphone-common/libs/pjproject/pjlib-util/src/pjlib-util-test/encryption.c
+++ b/sflphone-common/libs/pjproject/pjlib-util/src/pjlib-util-test/encryption.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include "test.h"
#include <pjlib-util.h>
diff --git a/sflphone-common/libs/pjproject/pjlib-util/src/pjlib-util-test/main.c b/sflphone-common/libs/pjproject/pjlib-util/src/pjlib-util-test/main.c
index 51a349b86bd1b7abdd0479383aec0f46bedddd31..04d9bf20dc5a85c65b39f0252cfe3e1af1025393 100644
--- a/sflphone-common/libs/pjproject/pjlib-util/src/pjlib-util-test/main.c
+++ b/sflphone-common/libs/pjproject/pjlib-util/src/pjlib-util-test/main.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include "test.h"
#include <pj/string.h>
diff --git a/sflphone-common/libs/pjproject/pjlib-util/src/pjlib-util-test/resolver_test.c b/sflphone-common/libs/pjproject/pjlib-util/src/pjlib-util-test/resolver_test.c
index 1a32863f4c760e9cad9987b8ff023d82bc48b75a..aeed176a64ece222ffedeaea3293581d4169fc0e 100644
--- a/sflphone-common/libs/pjproject/pjlib-util/src/pjlib-util-test/resolver_test.c
+++ b/sflphone-common/libs/pjproject/pjlib-util/src/pjlib-util-test/resolver_test.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pjlib-util.h>
#include <pjlib.h>
diff --git a/sflphone-common/libs/pjproject/pjlib-util/src/pjlib-util-test/stun.c b/sflphone-common/libs/pjproject/pjlib-util/src/pjlib-util-test/stun.c
index 66ebcaa44b59148b50a173b0db61bc85ba559354..1cd675cbfac119630722ace1b9888c77ae4a1c0a 100644
--- a/sflphone-common/libs/pjproject/pjlib-util/src/pjlib-util-test/stun.c
+++ b/sflphone-common/libs/pjproject/pjlib-util/src/pjlib-util-test/stun.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
static int decode_test(void)
diff --git a/sflphone-common/libs/pjproject/pjlib-util/src/pjlib-util-test/test.c b/sflphone-common/libs/pjproject/pjlib-util/src/pjlib-util-test/test.c
index 076ded197a0a52704760bd5291a4501a4596b789..bfa05dc065ec58d40d855fb7c4dab2ba051481cb 100644
--- a/sflphone-common/libs/pjproject/pjlib-util/src/pjlib-util-test/test.c
+++ b/sflphone-common/libs/pjproject/pjlib-util/src/pjlib-util-test/test.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include "test.h"
#include <pjlib.h>
diff --git a/sflphone-common/libs/pjproject/pjlib-util/src/pjlib-util-test/test.h b/sflphone-common/libs/pjproject/pjlib-util/src/pjlib-util-test/test.h
index 78a9aa15af8b6b382f7bc157e51f9475199ff8f2..2502082ed7999f6fd2008b35dcd80bb2cf1a5337 100644
--- a/sflphone-common/libs/pjproject/pjlib-util/src/pjlib-util-test/test.h
+++ b/sflphone-common/libs/pjproject/pjlib-util/src/pjlib-util-test/test.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pj/types.h>
diff --git a/sflphone-common/libs/pjproject/pjlib-util/src/pjlib-util-test/xml.c b/sflphone-common/libs/pjproject/pjlib-util/src/pjlib-util-test/xml.c
index ee2ce52525ada2fcb065fcad5fc4d8c6ba466d5a..426aaccb29489c56d9764d791e1f77a776a3e17b 100644
--- a/sflphone-common/libs/pjproject/pjlib-util/src/pjlib-util-test/xml.c
+++ b/sflphone-common/libs/pjproject/pjlib-util/src/pjlib-util-test/xml.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include "test.h"
diff --git a/sflphone-common/libs/pjproject/pjlib-util/src/pjlib-util/base64.c b/sflphone-common/libs/pjproject/pjlib-util/src/pjlib-util/base64.c
index 424fd83edc4402e4fb30267e3060a94de20051a2..7a552ac92c1428fc8c15976c75f14a14fccb5d71 100644
--- a/sflphone-common/libs/pjproject/pjlib-util/src/pjlib-util/base64.c
+++ b/sflphone-common/libs/pjproject/pjlib-util/src/pjlib-util/base64.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pjlib-util/base64.h>
#include <pj/assert.h>
diff --git a/sflphone-common/libs/pjproject/pjlib-util/src/pjlib-util/dns.c b/sflphone-common/libs/pjproject/pjlib-util/src/pjlib-util/dns.c
index de16a0e93468190da006327635b57391139773b9..cd65957fa068b6dd5c8837a8a2a901ba95e84541 100644
--- a/sflphone-common/libs/pjproject/pjlib-util/src/pjlib-util/dns.c
+++ b/sflphone-common/libs/pjproject/pjlib-util/src/pjlib-util/dns.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pjlib-util/dns.h>
#include <pjlib-util/errno.h>
diff --git a/sflphone-common/libs/pjproject/pjlib-util/src/pjlib-util/dns_dump.c b/sflphone-common/libs/pjproject/pjlib-util/src/pjlib-util/dns_dump.c
index 82a39074da8d7dae6ba314e8e6350380bce4e4ce..b19fb6cf2c27d2a1e63803c10325a0dcb0b7fb3d 100644
--- a/sflphone-common/libs/pjproject/pjlib-util/src/pjlib-util/dns_dump.c
+++ b/sflphone-common/libs/pjproject/pjlib-util/src/pjlib-util/dns_dump.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pjlib-util/dns.h>
#include <pj/assert.h>
diff --git a/sflphone-common/libs/pjproject/pjlib-util/src/pjlib-util/dns_server.c b/sflphone-common/libs/pjproject/pjlib-util/src/pjlib-util/dns_server.c
index c4f3eda2beae6caa80c13cd2ee666bbf2044caa5..d0912f85c4a9bc462f68821a207e6e490ccbc28c 100644
--- a/sflphone-common/libs/pjproject/pjlib-util/src/pjlib-util/dns_server.c
+++ b/sflphone-common/libs/pjproject/pjlib-util/src/pjlib-util/dns_server.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pjlib-util/dns_server.h>
#include <pjlib-util/errno.h>
diff --git a/sflphone-common/libs/pjproject/pjlib-util/src/pjlib-util/errno.c b/sflphone-common/libs/pjproject/pjlib-util/src/pjlib-util/errno.c
index bf685bc7c59aa5617efc800daf26aef7e71f9741..a2e8ab5b10e8d4fd4e1dcf6a4ec100b47d578152 100644
--- a/sflphone-common/libs/pjproject/pjlib-util/src/pjlib-util/errno.c
+++ b/sflphone-common/libs/pjproject/pjlib-util/src/pjlib-util/errno.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pjlib-util/errno.h>
#include <pjlib-util/types.h>
diff --git a/sflphone-common/libs/pjproject/pjlib-util/src/pjlib-util/getopt.c b/sflphone-common/libs/pjproject/pjlib-util/src/pjlib-util/getopt.c
index 0f8aca4d57fd1c35a5dcbe3ba8a8f867a0abda4f..d627a7cb8d5879fb7b8985c89f47d3ec64917c3c 100644
--- a/sflphone-common/libs/pjproject/pjlib-util/src/pjlib-util/getopt.c
+++ b/sflphone-common/libs/pjproject/pjlib-util/src/pjlib-util/getopt.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
/*
diff --git a/sflphone-common/libs/pjproject/pjlib-util/src/pjlib-util/hmac_md5.c b/sflphone-common/libs/pjproject/pjlib-util/src/pjlib-util/hmac_md5.c
index 95a212ad1b0c3096cec115c513c45d6e8e8e9895..e57e6eaf704bf6b3c2ecaf9d480acfcb6431832f 100644
--- a/sflphone-common/libs/pjproject/pjlib-util/src/pjlib-util/hmac_md5.c
+++ b/sflphone-common/libs/pjproject/pjlib-util/src/pjlib-util/hmac_md5.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pjlib-util/hmac_md5.h>
#include <pj/string.h>
diff --git a/sflphone-common/libs/pjproject/pjlib-util/src/pjlib-util/hmac_sha1.c b/sflphone-common/libs/pjproject/pjlib-util/src/pjlib-util/hmac_sha1.c
index 423faa8ade21e03663e5ebf69c8290f67d4d7202..c9a50a4573c8bfcc7d351c4e4aa775260af6e1eb 100644
--- a/sflphone-common/libs/pjproject/pjlib-util/src/pjlib-util/hmac_sha1.c
+++ b/sflphone-common/libs/pjproject/pjlib-util/src/pjlib-util/hmac_sha1.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pjlib-util/hmac_sha1.h>
#include <pj/string.h>
diff --git a/sflphone-common/libs/pjproject/pjlib-util/src/pjlib-util/pcap.c b/sflphone-common/libs/pjproject/pjlib-util/src/pjlib-util/pcap.c
index 69a772182ee3c934e106f8a7806cc6a341d8d608..8f58f37dd81f111dcc44fe1671c6dd65e81a2fd8 100644
--- a/sflphone-common/libs/pjproject/pjlib-util/src/pjlib-util/pcap.c
+++ b/sflphone-common/libs/pjproject/pjlib-util/src/pjlib-util/pcap.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pjlib-util/pcap.h>
#include <pj/assert.h>
diff --git a/sflphone-common/libs/pjproject/pjlib-util/src/pjlib-util/resolver.c b/sflphone-common/libs/pjproject/pjlib-util/src/pjlib-util/resolver.c
index 3c95964c05dcd2957e9a1ef4f7b3f8ea28dbdadd..32f621cf30841f3fbfcc9c8409a8f1b61893185f 100644
--- a/sflphone-common/libs/pjproject/pjlib-util/src/pjlib-util/resolver.c
+++ b/sflphone-common/libs/pjproject/pjlib-util/src/pjlib-util/resolver.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pjlib-util/resolver.h>
#include <pjlib-util/errno.h>
diff --git a/sflphone-common/libs/pjproject/pjlib-util/src/pjlib-util/resolver_wrap.cpp b/sflphone-common/libs/pjproject/pjlib-util/src/pjlib-util/resolver_wrap.cpp
index aece5356d7ae6cd2f685ba31f776372bfacfead5..07fb4468feb6954ec35315577cb42e710a94a303 100644
--- a/sflphone-common/libs/pjproject/pjlib-util/src/pjlib-util/resolver_wrap.cpp
+++ b/sflphone-common/libs/pjproject/pjlib-util/src/pjlib-util/resolver_wrap.cpp
@@ -15,6 +15,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
/*
diff --git a/sflphone-common/libs/pjproject/pjlib-util/src/pjlib-util/scanner.c b/sflphone-common/libs/pjproject/pjlib-util/src/pjlib-util/scanner.c
index c153f0838035ee9ccb477130794d189ee2a28d3f..7725ab054fb4e48606566879c523d4566f011c1d 100644
--- a/sflphone-common/libs/pjproject/pjlib-util/src/pjlib-util/scanner.c
+++ b/sflphone-common/libs/pjproject/pjlib-util/src/pjlib-util/scanner.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pjlib-util/scanner.h>
#include <pj/ctype.h>
diff --git a/sflphone-common/libs/pjproject/pjlib-util/src/pjlib-util/scanner_cis_bitwise.c b/sflphone-common/libs/pjproject/pjlib-util/src/pjlib-util/scanner_cis_bitwise.c
index 6387541d2f03c30ae77bdbbe35f1c2728c99c8c6..432e39ed767ab343042528435f96100502f0a8d8 100644
--- a/sflphone-common/libs/pjproject/pjlib-util/src/pjlib-util/scanner_cis_bitwise.c
+++ b/sflphone-common/libs/pjproject/pjlib-util/src/pjlib-util/scanner_cis_bitwise.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
/*
diff --git a/sflphone-common/libs/pjproject/pjlib-util/src/pjlib-util/scanner_cis_uint.c b/sflphone-common/libs/pjproject/pjlib-util/src/pjlib-util/scanner_cis_uint.c
index 5db0e77c83785ce6a3166bddf2921da03630889d..1b503b2a2d89e794d9665e607d9051b037cf301d 100644
--- a/sflphone-common/libs/pjproject/pjlib-util/src/pjlib-util/scanner_cis_uint.c
+++ b/sflphone-common/libs/pjproject/pjlib-util/src/pjlib-util/scanner_cis_uint.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
/*
diff --git a/sflphone-common/libs/pjproject/pjlib-util/src/pjlib-util/srv_resolver.c b/sflphone-common/libs/pjproject/pjlib-util/src/pjlib-util/srv_resolver.c
index 06abdd7a70d8c6d1fcc7112114d3309eac0a1040..0d7a9f45c47221ef1aeae1c19bc2456b0f3f8ca8 100644
--- a/sflphone-common/libs/pjproject/pjlib-util/src/pjlib-util/srv_resolver.c
+++ b/sflphone-common/libs/pjproject/pjlib-util/src/pjlib-util/srv_resolver.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pjlib-util/srv_resolver.h>
#include <pjlib-util/errno.h>
diff --git a/sflphone-common/libs/pjproject/pjlib-util/src/pjlib-util/string.c b/sflphone-common/libs/pjproject/pjlib-util/src/pjlib-util/string.c
index 6bab7ebb55dbd98b32f5c6fecdbde240395e3a77..2a926009223a5118b1543916baa5dcbfb7950f1d 100644
--- a/sflphone-common/libs/pjproject/pjlib-util/src/pjlib-util/string.c
+++ b/sflphone-common/libs/pjproject/pjlib-util/src/pjlib-util/string.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pjlib-util/string.h>
#include <pj/ctype.h>
diff --git a/sflphone-common/libs/pjproject/pjlib-util/src/pjlib-util/stun_simple.c b/sflphone-common/libs/pjproject/pjlib-util/src/pjlib-util/stun_simple.c
index 14f525506ceb71031eb9bcb8a90563fd104f9a8d..c34d3c1b80b4445f2a5fb3612388005887bbebc8 100644
--- a/sflphone-common/libs/pjproject/pjlib-util/src/pjlib-util/stun_simple.c
+++ b/sflphone-common/libs/pjproject/pjlib-util/src/pjlib-util/stun_simple.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pjlib-util/stun_simple.h>
#include <pjlib-util/errno.h>
diff --git a/sflphone-common/libs/pjproject/pjlib-util/src/pjlib-util/stun_simple_client.c b/sflphone-common/libs/pjproject/pjlib-util/src/pjlib-util/stun_simple_client.c
index 348fcf9c145f0322aff1f3a294219eb91a640b71..a3e18cdba9ebba07d83937c1b45c424321d6301e 100644
--- a/sflphone-common/libs/pjproject/pjlib-util/src/pjlib-util/stun_simple_client.c
+++ b/sflphone-common/libs/pjproject/pjlib-util/src/pjlib-util/stun_simple_client.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pjlib-util/stun_simple.h>
#include <pjlib-util/errno.h>
diff --git a/sflphone-common/libs/pjproject/pjlib-util/src/pjlib-util/symbols.c b/sflphone-common/libs/pjproject/pjlib-util/src/pjlib-util/symbols.c
index 3a53cdea3e0d4802831ae0ab581b628976af9db2..c26c5c0d5cad34829352923bc278b28f60a1f78c 100644
--- a/sflphone-common/libs/pjproject/pjlib-util/src/pjlib-util/symbols.c
+++ b/sflphone-common/libs/pjproject/pjlib-util/src/pjlib-util/symbols.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pjlib.h>
#include <pjlib-util.h>
diff --git a/sflphone-common/libs/pjproject/pjlib-util/src/pjlib-util/xml.c b/sflphone-common/libs/pjproject/pjlib-util/src/pjlib-util/xml.c
index 76ec2c595ab1d1cca410644d26e7e342631d5768..4240e30b88b206120d8f698a6b0d55e18dd0aa0a 100644
--- a/sflphone-common/libs/pjproject/pjlib-util/src/pjlib-util/xml.c
+++ b/sflphone-common/libs/pjproject/pjlib-util/src/pjlib-util/xml.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pjlib-util/xml.h>
#include <pjlib-util/scanner.h>
diff --git a/sflphone-common/libs/pjproject/pjlib-util/src/pjlib-util/xml_wrap.cpp b/sflphone-common/libs/pjproject/pjlib-util/src/pjlib-util/xml_wrap.cpp
index b33e4d3cf145876a10313ff81af241f8e08a08cd..aa80d827b5d50544f3f4ba622cddd5b76b847d69 100644
--- a/sflphone-common/libs/pjproject/pjlib-util/src/pjlib-util/xml_wrap.cpp
+++ b/sflphone-common/libs/pjproject/pjlib-util/src/pjlib-util/xml_wrap.cpp
@@ -15,6 +15,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
/*
diff --git a/sflphone-common/libs/pjproject/pjlib/include/pj++/file.hpp b/sflphone-common/libs/pjproject/pjlib/include/pj++/file.hpp
index d37defc36116679623f54e5aa67e405881eddf08..df78aebd225b5269f8d34ef3dfc0ba0796d8756c 100644
--- a/sflphone-common/libs/pjproject/pjlib/include/pj++/file.hpp
+++ b/sflphone-common/libs/pjproject/pjlib/include/pj++/file.hpp
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJPP_FILE_HPP__
#define __PJPP_FILE_HPP__
diff --git a/sflphone-common/libs/pjproject/pjlib/include/pj++/hash.hpp b/sflphone-common/libs/pjproject/pjlib/include/pj++/hash.hpp
index b8b0a9a642d5ae9a0c28f4bb3a695b9a73e54b8f..53e91ba545eb8e3012bc2502eedb495abdc76ee1 100644
--- a/sflphone-common/libs/pjproject/pjlib/include/pj++/hash.hpp
+++ b/sflphone-common/libs/pjproject/pjlib/include/pj++/hash.hpp
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJPP_HASH_HPP__
#define __PJPP_HASH_HPP__
diff --git a/sflphone-common/libs/pjproject/pjlib/include/pj++/list.hpp b/sflphone-common/libs/pjproject/pjlib/include/pj++/list.hpp
index 24217c9b7bc2a7731e1cfe7bd9a0ccb490ce8089..503a72965c9e4c9816064f18b4b0b9429ab8dd13 100644
--- a/sflphone-common/libs/pjproject/pjlib/include/pj++/list.hpp
+++ b/sflphone-common/libs/pjproject/pjlib/include/pj++/list.hpp
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJPP_LIST_HPP__
#define __PJPP_LIST_HPP__
diff --git a/sflphone-common/libs/pjproject/pjlib/include/pj++/lock.hpp b/sflphone-common/libs/pjproject/pjlib/include/pj++/lock.hpp
index 43779a69be548c3b3f1555c43e86bdd6e74f3df5..5719c03aacfd502123b8bcf93689e10d6c9b3b45 100644
--- a/sflphone-common/libs/pjproject/pjlib/include/pj++/lock.hpp
+++ b/sflphone-common/libs/pjproject/pjlib/include/pj++/lock.hpp
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJPP_LOCK_HPP__
#define __PJPP_LOCK_HPP__
diff --git a/sflphone-common/libs/pjproject/pjlib/include/pj++/os.hpp b/sflphone-common/libs/pjproject/pjlib/include/pj++/os.hpp
index 6c87f31ef2b117cb6705dfe1815010f3b009d137..bf8a15078ae33a297858dcbe909c33394a6da9d0 100644
--- a/sflphone-common/libs/pjproject/pjlib/include/pj++/os.hpp
+++ b/sflphone-common/libs/pjproject/pjlib/include/pj++/os.hpp
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJPP_OS_HPP__
#define __PJPP_OS_HPP__
diff --git a/sflphone-common/libs/pjproject/pjlib/include/pj++/pool.hpp b/sflphone-common/libs/pjproject/pjlib/include/pj++/pool.hpp
index 8800ddbda78dde1357f136750af8590c067c1c64..437bd12c7df426ea7eee09067eb0174dd7de0ed0 100644
--- a/sflphone-common/libs/pjproject/pjlib/include/pj++/pool.hpp
+++ b/sflphone-common/libs/pjproject/pjlib/include/pj++/pool.hpp
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJPP_POOL_HPP__
#define __PJPP_POOL_HPP__
diff --git a/sflphone-common/libs/pjproject/pjlib/include/pj++/proactor.hpp b/sflphone-common/libs/pjproject/pjlib/include/pj++/proactor.hpp
index 7e335645c255110c1ee6ba6fa5d749112c91fc1a..4db72d4c3c68481763f5c1c8537c2cce16b8ed90 100644
--- a/sflphone-common/libs/pjproject/pjlib/include/pj++/proactor.hpp
+++ b/sflphone-common/libs/pjproject/pjlib/include/pj++/proactor.hpp
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJPP_PROACTOR_HPP__
#define __PJPP_PROACTOR_HPP__
diff --git a/sflphone-common/libs/pjproject/pjlib/include/pj++/scanner.hpp b/sflphone-common/libs/pjproject/pjlib/include/pj++/scanner.hpp
index a3de6d88c4fe89250dbdacec3c5430abc2b28807..6f05b1f6b76dc866779262e5bb230998fead1bd8 100644
--- a/sflphone-common/libs/pjproject/pjlib/include/pj++/scanner.hpp
+++ b/sflphone-common/libs/pjproject/pjlib/include/pj++/scanner.hpp
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJPP_SCANNER_HPP__
#define __PJPP_SCANNER_HPP__
diff --git a/sflphone-common/libs/pjproject/pjlib/include/pj++/sock.hpp b/sflphone-common/libs/pjproject/pjlib/include/pj++/sock.hpp
index 1b2b67a33b9055a5c8a4ba3080c21090a5cffdc2..c5583da2b7c70bacaaee691c12d3cd96829c8ea9 100644
--- a/sflphone-common/libs/pjproject/pjlib/include/pj++/sock.hpp
+++ b/sflphone-common/libs/pjproject/pjlib/include/pj++/sock.hpp
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJPP_SOCK_HPP__
#define __PJPP_SOCK_HPP__
diff --git a/sflphone-common/libs/pjproject/pjlib/include/pj++/string.hpp b/sflphone-common/libs/pjproject/pjlib/include/pj++/string.hpp
index 3c2168566b5b4ae272420b1586caa7418cee0b6a..d183fbb9d1bb6f75df80e1adc82a9bf27669bf27 100644
--- a/sflphone-common/libs/pjproject/pjlib/include/pj++/string.hpp
+++ b/sflphone-common/libs/pjproject/pjlib/include/pj++/string.hpp
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJPP_STRING_HPP__
#define __PJPP_STRING_HPP__
diff --git a/sflphone-common/libs/pjproject/pjlib/include/pj++/timer.hpp b/sflphone-common/libs/pjproject/pjlib/include/pj++/timer.hpp
index c6bae69b20c710de0bb6416bc744a98d5c46c5f4..0301d3b9c58afadbf2cd01ade697e24a0f618959 100644
--- a/sflphone-common/libs/pjproject/pjlib/include/pj++/timer.hpp
+++ b/sflphone-common/libs/pjproject/pjlib/include/pj++/timer.hpp
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJPP_TIMER_HPP__
#define __PJPP_TIMER_HPP__
diff --git a/sflphone-common/libs/pjproject/pjlib/include/pj++/tree.hpp b/sflphone-common/libs/pjproject/pjlib/include/pj++/tree.hpp
index 2c963ab9097b13ea2c833397db09a7629b6cd4a7..53d8400cdf8614938903896ccddaf44a6237a18f 100644
--- a/sflphone-common/libs/pjproject/pjlib/include/pj++/tree.hpp
+++ b/sflphone-common/libs/pjproject/pjlib/include/pj++/tree.hpp
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJPP_TREE_HPP__
#define __PJPP_TREE_HPP__
diff --git a/sflphone-common/libs/pjproject/pjlib/include/pj++/types.hpp b/sflphone-common/libs/pjproject/pjlib/include/pj++/types.hpp
index 4140a347cc7e2b5f888064a84dc648d72d650fce..831266b82ffbe01d8c9473dad39e9ed32ad49ad9 100644
--- a/sflphone-common/libs/pjproject/pjlib/include/pj++/types.hpp
+++ b/sflphone-common/libs/pjproject/pjlib/include/pj++/types.hpp
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJPP_TYPES_HPP__
#define __PJPP_TYPES_HPP__
diff --git a/sflphone-common/libs/pjproject/pjlib/include/pj/activesock.h b/sflphone-common/libs/pjproject/pjlib/include/pj/activesock.h
index 3611d3a35169d2e4e6a63d39a9521324bffeba8c..a485d28321a5856e1412cbf2ea083c87a5dc414f 100644
--- a/sflphone-common/libs/pjproject/pjlib/include/pj/activesock.h
+++ b/sflphone-common/libs/pjproject/pjlib/include/pj/activesock.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJ_ASYNCSOCK_H__
#define __PJ_ASYNCSOCK_H__
diff --git a/sflphone-common/libs/pjproject/pjlib/include/pj/addr_resolv.h b/sflphone-common/libs/pjproject/pjlib/include/pj/addr_resolv.h
index 04db2f08515a8a87d25c10c2190da84b704f0cac..d74d3f53c886da3789bd2c7534e569b77a3d918d 100644
--- a/sflphone-common/libs/pjproject/pjlib/include/pj/addr_resolv.h
+++ b/sflphone-common/libs/pjproject/pjlib/include/pj/addr_resolv.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJ_ADDR_RESOLV_H__
#define __PJ_ADDR_RESOLV_H__
diff --git a/sflphone-common/libs/pjproject/pjlib/include/pj/array.h b/sflphone-common/libs/pjproject/pjlib/include/pj/array.h
index 9c13df80d056a72c626828dbf7d093aaeba18326..b659d1738fdbe665c415de0c4f1b05912b67993a 100644
--- a/sflphone-common/libs/pjproject/pjlib/include/pj/array.h
+++ b/sflphone-common/libs/pjproject/pjlib/include/pj/array.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJ_ARRAY_H__
#define __PJ_ARRAY_H__
diff --git a/sflphone-common/libs/pjproject/pjlib/include/pj/assert.h b/sflphone-common/libs/pjproject/pjlib/include/pj/assert.h
index 65a7a4a88d66169c5b79d385d367822f77856a10..52c457011c539d2cc1f3ee627cd8eaacc236b30b 100644
--- a/sflphone-common/libs/pjproject/pjlib/include/pj/assert.h
+++ b/sflphone-common/libs/pjproject/pjlib/include/pj/assert.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJ_ASSERT_H__
#define __PJ_ASSERT_H__
diff --git a/sflphone-common/libs/pjproject/pjlib/include/pj/compat/assert.h b/sflphone-common/libs/pjproject/pjlib/include/pj/compat/assert.h
index 5ced41e3c62a5597b86507fd6ca9470e4b33be28..2781bb3d8e3059781fe2c8e7b94d9950f7982bf0 100644
--- a/sflphone-common/libs/pjproject/pjlib/include/pj/compat/assert.h
+++ b/sflphone-common/libs/pjproject/pjlib/include/pj/compat/assert.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJ_COMPAT_ASSERT_H__
#define __PJ_COMPAT_ASSERT_H__
diff --git a/sflphone-common/libs/pjproject/pjlib/include/pj/compat/cc_armcc.h b/sflphone-common/libs/pjproject/pjlib/include/pj/compat/cc_armcc.h
index a6b8dfe90711e8fb542e0fb65e047d136d98a4d2..4f177a99976dd91caf058e3b1ea121fe9e5cdff1 100644
--- a/sflphone-common/libs/pjproject/pjlib/include/pj/compat/cc_armcc.h
+++ b/sflphone-common/libs/pjproject/pjlib/include/pj/compat/cc_armcc.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJ_COMPAT_CC_ARMCC_H__
#define __PJ_COMPAT_CC_ARMCC_H__
diff --git a/sflphone-common/libs/pjproject/pjlib/include/pj/compat/cc_codew.h b/sflphone-common/libs/pjproject/pjlib/include/pj/compat/cc_codew.h
index 79730cb398409cbbd5bc9c08bd6e91e7e0577529..491dc56f7798840138f2f56dccb0d0dcde0b73ac 100644
--- a/sflphone-common/libs/pjproject/pjlib/include/pj/compat/cc_codew.h
+++ b/sflphone-common/libs/pjproject/pjlib/include/pj/compat/cc_codew.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJ_COMPAT_CC_CODEW_H__
#define __PJ_COMPAT_CC_CODEW_H__
diff --git a/sflphone-common/libs/pjproject/pjlib/include/pj/compat/cc_gcc.h b/sflphone-common/libs/pjproject/pjlib/include/pj/compat/cc_gcc.h
index 78d7e8c92174562657ecd38f6ff364ed388058c9..ff2239d6013116a851a6b710d6dc7a77f7626a0f 100644
--- a/sflphone-common/libs/pjproject/pjlib/include/pj/compat/cc_gcc.h
+++ b/sflphone-common/libs/pjproject/pjlib/include/pj/compat/cc_gcc.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJ_COMPAT_CC_GCC_H__
#define __PJ_COMPAT_CC_GCC_H__
diff --git a/sflphone-common/libs/pjproject/pjlib/include/pj/compat/cc_gcce.h b/sflphone-common/libs/pjproject/pjlib/include/pj/compat/cc_gcce.h
index 5e423781ea56e1ead2ce42d0f3e06a9707e0ea99..4f56e74c817593310f053a696071f133b3014af4 100644
--- a/sflphone-common/libs/pjproject/pjlib/include/pj/compat/cc_gcce.h
+++ b/sflphone-common/libs/pjproject/pjlib/include/pj/compat/cc_gcce.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJ_COMPAT_CC_GCCE_H__
#define __PJ_COMPAT_CC_GCCE_H__
diff --git a/sflphone-common/libs/pjproject/pjlib/include/pj/compat/cc_msvc.h b/sflphone-common/libs/pjproject/pjlib/include/pj/compat/cc_msvc.h
index a7c50375d8df3aba0fa0c8269c14133bb155254b..edd950585a30bd2d6de9fff18a5ec4d6898dc5e2 100644
--- a/sflphone-common/libs/pjproject/pjlib/include/pj/compat/cc_msvc.h
+++ b/sflphone-common/libs/pjproject/pjlib/include/pj/compat/cc_msvc.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJ_COMPAT_CC_MSVC_H__
#define __PJ_COMPAT_CC_MSVC_H__
diff --git a/sflphone-common/libs/pjproject/pjlib/include/pj/compat/cc_mwcc.h b/sflphone-common/libs/pjproject/pjlib/include/pj/compat/cc_mwcc.h
index a770110d09aaa143ed51b4fab2d6d432525989b7..6572de0270aa407450767b5a169417fc2dd12e8d 100644
--- a/sflphone-common/libs/pjproject/pjlib/include/pj/compat/cc_mwcc.h
+++ b/sflphone-common/libs/pjproject/pjlib/include/pj/compat/cc_mwcc.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJ_COMPAT_CC_MWCC_H__
#define __PJ_COMPAT_CC_MWCC_H__
diff --git a/sflphone-common/libs/pjproject/pjlib/include/pj/compat/ctype.h b/sflphone-common/libs/pjproject/pjlib/include/pj/compat/ctype.h
index a714964bc70cdaaec4b2f663a88b504f55f203eb..7678c7279673b1d3724f261a9a3b4a3ddf0a4cba 100644
--- a/sflphone-common/libs/pjproject/pjlib/include/pj/compat/ctype.h
+++ b/sflphone-common/libs/pjproject/pjlib/include/pj/compat/ctype.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJ_COMPAT_CTYPE_H__
#define __PJ_COMPAT_CTYPE_H__
diff --git a/sflphone-common/libs/pjproject/pjlib/include/pj/compat/errno.h b/sflphone-common/libs/pjproject/pjlib/include/pj/compat/errno.h
index fc39bfb9f34cfe0719831f911554a763a73e68c3..2463359d06c128f4a53980a75d534e50e19c4995 100644
--- a/sflphone-common/libs/pjproject/pjlib/include/pj/compat/errno.h
+++ b/sflphone-common/libs/pjproject/pjlib/include/pj/compat/errno.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJ_COMPAT_ERRNO_H__
#define __PJ_COMPAT_ERRNO_H__
diff --git a/sflphone-common/libs/pjproject/pjlib/include/pj/compat/high_precision.h b/sflphone-common/libs/pjproject/pjlib/include/pj/compat/high_precision.h
index 1bbcf0350bf80237cebacda3e8c543b63223b996..d4c2c13031cc91111b389ca78d1bffbd5fd10280 100644
--- a/sflphone-common/libs/pjproject/pjlib/include/pj/compat/high_precision.h
+++ b/sflphone-common/libs/pjproject/pjlib/include/pj/compat/high_precision.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJ_COMPAT_HIGH_PRECISION_H__
#define __PJ_COMPAT_HIGH_PRECISION_H__
diff --git a/sflphone-common/libs/pjproject/pjlib/include/pj/compat/m_alpha.h b/sflphone-common/libs/pjproject/pjlib/include/pj/compat/m_alpha.h
index 5ccbaddcb35f2719237af5fd204c57fb524ab92c..16333c446e6620db171421dc60ad97f210e16588 100644
--- a/sflphone-common/libs/pjproject/pjlib/include/pj/compat/m_alpha.h
+++ b/sflphone-common/libs/pjproject/pjlib/include/pj/compat/m_alpha.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJ_COMPAT_M_ALPHA_H__
#define __PJ_COMPAT_M_ALPHA_H__
diff --git a/sflphone-common/libs/pjproject/pjlib/include/pj/compat/m_armv4.h b/sflphone-common/libs/pjproject/pjlib/include/pj/compat/m_armv4.h
index 4c804f8cb6e8cc56dfa31612c35ed1d39d3c2dd0..dfd2cebb6258059b26f8b0370a4501262d7b0b06 100644
--- a/sflphone-common/libs/pjproject/pjlib/include/pj/compat/m_armv4.h
+++ b/sflphone-common/libs/pjproject/pjlib/include/pj/compat/m_armv4.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJ_COMPAT_M_ARMV4_H__
#define __PJ_COMPAT_M_ARMV4_H__
diff --git a/sflphone-common/libs/pjproject/pjlib/include/pj/compat/m_auto.h.in b/sflphone-common/libs/pjproject/pjlib/include/pj/compat/m_auto.h.in
index ea2a7016469d6d857a7c87c4f387ba5afc20177c..44578ae2cd1a00052627100e8f66b2adba721747 100644
--- a/sflphone-common/libs/pjproject/pjlib/include/pj/compat/m_auto.h.in
+++ b/sflphone-common/libs/pjproject/pjlib/include/pj/compat/m_auto.h.in
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJ_COMPAT_M_AUTO_H__
#define __PJ_COMPAT_M_AUTO_H__
diff --git a/sflphone-common/libs/pjproject/pjlib/include/pj/compat/m_i386.h b/sflphone-common/libs/pjproject/pjlib/include/pj/compat/m_i386.h
index 2a0aeb7e18ca7e19367a6ed34c408ba19efd0fe5..b3b73b14a2724eac82b2f722cdf93e7e0039e51c 100644
--- a/sflphone-common/libs/pjproject/pjlib/include/pj/compat/m_i386.h
+++ b/sflphone-common/libs/pjproject/pjlib/include/pj/compat/m_i386.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJ_COMPAT_M_i386_H__
#define __PJ_COMPAT_M_i386_H__
diff --git a/sflphone-common/libs/pjproject/pjlib/include/pj/compat/m_m68k.h b/sflphone-common/libs/pjproject/pjlib/include/pj/compat/m_m68k.h
index b3203f69ab48e22491eea9bd5dc7e6f6498177a2..adbebfe9f01012b8481db1663f95651eff0e74ed 100644
--- a/sflphone-common/libs/pjproject/pjlib/include/pj/compat/m_m68k.h
+++ b/sflphone-common/libs/pjproject/pjlib/include/pj/compat/m_m68k.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJ_COMPAT_M_M68K_H__
#define __PJ_COMPAT_M_M68K_H__
diff --git a/sflphone-common/libs/pjproject/pjlib/include/pj/compat/m_powerpc.h b/sflphone-common/libs/pjproject/pjlib/include/pj/compat/m_powerpc.h
index 20a50bdfa3717a1b6e6d054655c51518fbc434f2..58a648f59b0a98b97a947e25e98e24d9bb1ba9f6 100644
--- a/sflphone-common/libs/pjproject/pjlib/include/pj/compat/m_powerpc.h
+++ b/sflphone-common/libs/pjproject/pjlib/include/pj/compat/m_powerpc.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJ_COMPAT_M_POWERPC_H__
#define __PJ_COMPAT_M_POWERPC_H__
diff --git a/sflphone-common/libs/pjproject/pjlib/include/pj/compat/m_sparc.h b/sflphone-common/libs/pjproject/pjlib/include/pj/compat/m_sparc.h
index ac74f1f61b17538c6552f917117983aca53aed8f..33e4c7e53601aea0a4e95f9b698f07773e779076 100644
--- a/sflphone-common/libs/pjproject/pjlib/include/pj/compat/m_sparc.h
+++ b/sflphone-common/libs/pjproject/pjlib/include/pj/compat/m_sparc.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJ_COMPAT_M_SPARC_H__
#define __PJ_COMPAT_M_SPARC_H__
diff --git a/sflphone-common/libs/pjproject/pjlib/include/pj/compat/m_x86_64.h b/sflphone-common/libs/pjproject/pjlib/include/pj/compat/m_x86_64.h
index 11599aa617ddce8ad5f5a541d0206a5c4c5badaf..b85ee9032441718524314914555a640244c717bc 100644
--- a/sflphone-common/libs/pjproject/pjlib/include/pj/compat/m_x86_64.h
+++ b/sflphone-common/libs/pjproject/pjlib/include/pj/compat/m_x86_64.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJ_COMPAT_M_x86_64_H__
#define __PJ_COMPAT_M_x86_64_H__
diff --git a/sflphone-common/libs/pjproject/pjlib/include/pj/compat/malloc.h b/sflphone-common/libs/pjproject/pjlib/include/pj/compat/malloc.h
index 66368e170367f12a708e6c347521bce5787895dd..708a09723f1c6b7a6ac544478d4c83884186ebff 100644
--- a/sflphone-common/libs/pjproject/pjlib/include/pj/compat/malloc.h
+++ b/sflphone-common/libs/pjproject/pjlib/include/pj/compat/malloc.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJ_COMPAT_MALLOC_H__
#define __PJ_COMPAT_MALLOC_H__
diff --git a/sflphone-common/libs/pjproject/pjlib/include/pj/compat/os_auto.h.in b/sflphone-common/libs/pjproject/pjlib/include/pj/compat/os_auto.h.in
index 187717519014d146281e6152995052f5251a7c4a..ce51ae76d0b58ea6575fd055d91fac72790c9933 100644
--- a/sflphone-common/libs/pjproject/pjlib/include/pj/compat/os_auto.h.in
+++ b/sflphone-common/libs/pjproject/pjlib/include/pj/compat/os_auto.h.in
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJ_COMPAT_OS_AUTO_H__
#define __PJ_COMPAT_OS_AUTO_H__
diff --git a/sflphone-common/libs/pjproject/pjlib/include/pj/compat/os_darwinos.h b/sflphone-common/libs/pjproject/pjlib/include/pj/compat/os_darwinos.h
index 4afbe02aa6f45f102f54386f70b94f3910685db1..dc4c2f1fb8b1b4cef483364a59679d9f5f72130f 100644
--- a/sflphone-common/libs/pjproject/pjlib/include/pj/compat/os_darwinos.h
+++ b/sflphone-common/libs/pjproject/pjlib/include/pj/compat/os_darwinos.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJ_COMPAT_OS_DARWINOS_H__
#define __PJ_COMPAT_OS_DARWINOS_H__
diff --git a/sflphone-common/libs/pjproject/pjlib/include/pj/compat/os_linux.h b/sflphone-common/libs/pjproject/pjlib/include/pj/compat/os_linux.h
index a13354922249bc32eddcca6cba59258cdfe6273a..b1e9d485d8bea1b7ad32c583a00e295e406a1165 100644
--- a/sflphone-common/libs/pjproject/pjlib/include/pj/compat/os_linux.h
+++ b/sflphone-common/libs/pjproject/pjlib/include/pj/compat/os_linux.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJ_COMPAT_OS_LINUX_H__
#define __PJ_COMPAT_OS_LINUX_H__
diff --git a/sflphone-common/libs/pjproject/pjlib/include/pj/compat/os_linux_kernel.h b/sflphone-common/libs/pjproject/pjlib/include/pj/compat/os_linux_kernel.h
index 1aca5719f47df22ddf9616a2e5287aba09100922..84712da502b0671d684b9a4ee36e237dbe6ed6da 100644
--- a/sflphone-common/libs/pjproject/pjlib/include/pj/compat/os_linux_kernel.h
+++ b/sflphone-common/libs/pjproject/pjlib/include/pj/compat/os_linux_kernel.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJ_COMPAT_OS_LINUX_KERNEL_H__
#define __PJ_COMPAT_OS_LINUX_KERNEL_H__
diff --git a/sflphone-common/libs/pjproject/pjlib/include/pj/compat/os_palmos.h b/sflphone-common/libs/pjproject/pjlib/include/pj/compat/os_palmos.h
index deff12c6dcdb48c25d991c2172f9560b503e86f7..c300c5298f4ad69732f63b5930ada516c9c265f7 100644
--- a/sflphone-common/libs/pjproject/pjlib/include/pj/compat/os_palmos.h
+++ b/sflphone-common/libs/pjproject/pjlib/include/pj/compat/os_palmos.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJ_COMPAT_OS_PALMOS_H__
#define __PJ_COMPAT_OS_PALMOS_H__
diff --git a/sflphone-common/libs/pjproject/pjlib/include/pj/compat/os_rtems.h b/sflphone-common/libs/pjproject/pjlib/include/pj/compat/os_rtems.h
index e0133d5c9f9f70f0c65d9aa553cec65f9e648f8b..b48bb48202416f64e30881fe99b2fadd0824ab49 100644
--- a/sflphone-common/libs/pjproject/pjlib/include/pj/compat/os_rtems.h
+++ b/sflphone-common/libs/pjproject/pjlib/include/pj/compat/os_rtems.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
/*
diff --git a/sflphone-common/libs/pjproject/pjlib/include/pj/compat/os_sunos.h b/sflphone-common/libs/pjproject/pjlib/include/pj/compat/os_sunos.h
index ef52f000ba0e4abb57b1fde1b3e4220660673030..6609ccf286cfe5f8aaf3981eba2e347905dd3a57 100644
--- a/sflphone-common/libs/pjproject/pjlib/include/pj/compat/os_sunos.h
+++ b/sflphone-common/libs/pjproject/pjlib/include/pj/compat/os_sunos.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJ_COMPAT_OS_SUNOS_H__
#define __PJ_COMPAT_OS_SUNOS_H__
diff --git a/sflphone-common/libs/pjproject/pjlib/include/pj/compat/os_symbian.h b/sflphone-common/libs/pjproject/pjlib/include/pj/compat/os_symbian.h
index 727cbc153d8d2b89757b4515785c3c43f0d960d6..4a65c8c4c55b19f43bc4bec4ecd7177472c3eba3 100644
--- a/sflphone-common/libs/pjproject/pjlib/include/pj/compat/os_symbian.h
+++ b/sflphone-common/libs/pjproject/pjlib/include/pj/compat/os_symbian.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJ_COMPAT_OS_SYMBIAN_H__
#define __PJ_COMPAT_OS_SYMBIAN_H__
diff --git a/sflphone-common/libs/pjproject/pjlib/include/pj/compat/os_win32.h b/sflphone-common/libs/pjproject/pjlib/include/pj/compat/os_win32.h
index 496d4780506ad1c2fc23fda1239428466dfdaa1f..fd699e4ccf236cbdad3b9d2bad4e6f5df95345bf 100644
--- a/sflphone-common/libs/pjproject/pjlib/include/pj/compat/os_win32.h
+++ b/sflphone-common/libs/pjproject/pjlib/include/pj/compat/os_win32.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJ_COMPAT_OS_WIN32_H__
#define __PJ_COMPAT_OS_WIN32_H__
diff --git a/sflphone-common/libs/pjproject/pjlib/include/pj/compat/os_win32_wince.h b/sflphone-common/libs/pjproject/pjlib/include/pj/compat/os_win32_wince.h
index 16d3019479b33654bdce848c8738db6e72eff316..a69e8dc9fd5ce3ac6d7bdf7b1b828b692943b018 100644
--- a/sflphone-common/libs/pjproject/pjlib/include/pj/compat/os_win32_wince.h
+++ b/sflphone-common/libs/pjproject/pjlib/include/pj/compat/os_win32_wince.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJ_COMPAT_OS_WIN32_WINCE_H__
#define __PJ_COMPAT_OS_WIN32_WINCE_H__
diff --git a/sflphone-common/libs/pjproject/pjlib/include/pj/compat/rand.h b/sflphone-common/libs/pjproject/pjlib/include/pj/compat/rand.h
index b0179450d08ccc8102298a6dad86c1c6f74620a6..d82c5ac4afb31c5632979ca91321962e52b0598a 100644
--- a/sflphone-common/libs/pjproject/pjlib/include/pj/compat/rand.h
+++ b/sflphone-common/libs/pjproject/pjlib/include/pj/compat/rand.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJ_COMPAT_RAND_H__
#define __PJ_COMPAT_RAND_H__
diff --git a/sflphone-common/libs/pjproject/pjlib/include/pj/compat/setjmp.h b/sflphone-common/libs/pjproject/pjlib/include/pj/compat/setjmp.h
index ecf8ed729b0c117d17258c5ab24b09f643c7d437..fd007007572bc0b60a8f63f2983852a3ed1fa16a 100644
--- a/sflphone-common/libs/pjproject/pjlib/include/pj/compat/setjmp.h
+++ b/sflphone-common/libs/pjproject/pjlib/include/pj/compat/setjmp.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJ_COMPAT_SETJMP_H__
#define __PJ_COMPAT_SETJMP_H__
diff --git a/sflphone-common/libs/pjproject/pjlib/include/pj/compat/size_t.h b/sflphone-common/libs/pjproject/pjlib/include/pj/compat/size_t.h
index d3c270cc3de35d0f20d090b0908edf3d73f71c51..9cc2e9a66fe4a554a6bfedbb4251cd6778e5df26 100644
--- a/sflphone-common/libs/pjproject/pjlib/include/pj/compat/size_t.h
+++ b/sflphone-common/libs/pjproject/pjlib/include/pj/compat/size_t.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJ_COMPAT_SIZE_T_H__
#define __PJ_COMPAT_SIZE_T_H__
diff --git a/sflphone-common/libs/pjproject/pjlib/include/pj/compat/socket.h b/sflphone-common/libs/pjproject/pjlib/include/pj/compat/socket.h
index b091c40ba69fcb51e23e2e66619df9c9162a615b..b11ffeb3f4feea609d323853085156be0185945c 100644
--- a/sflphone-common/libs/pjproject/pjlib/include/pj/compat/socket.h
+++ b/sflphone-common/libs/pjproject/pjlib/include/pj/compat/socket.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJ_COMPAT_SOCKET_H__
#define __PJ_COMPAT_SOCKET_H__
diff --git a/sflphone-common/libs/pjproject/pjlib/include/pj/compat/stdarg.h b/sflphone-common/libs/pjproject/pjlib/include/pj/compat/stdarg.h
index 202b90563db02b48420b92c9b7f37ddf3002f4e6..e3725a404ab07fe727e87615161d4cd7c464d044 100644
--- a/sflphone-common/libs/pjproject/pjlib/include/pj/compat/stdarg.h
+++ b/sflphone-common/libs/pjproject/pjlib/include/pj/compat/stdarg.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJ_COMPAT_STDARG_H__
#define __PJ_COMPAT_STDARG_H__
diff --git a/sflphone-common/libs/pjproject/pjlib/include/pj/compat/stdfileio.h b/sflphone-common/libs/pjproject/pjlib/include/pj/compat/stdfileio.h
index 56655232ad1038b0b513128f658e9fe5a799e287..ec6cbfc5e30ea6b354fdec99fba444a8925cf402 100644
--- a/sflphone-common/libs/pjproject/pjlib/include/pj/compat/stdfileio.h
+++ b/sflphone-common/libs/pjproject/pjlib/include/pj/compat/stdfileio.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJ_COMPAT_STDFILEIO_H__
#define __PJ_COMPAT_STDFILEIO_H__
diff --git a/sflphone-common/libs/pjproject/pjlib/include/pj/compat/string.h b/sflphone-common/libs/pjproject/pjlib/include/pj/compat/string.h
index e0ceb53f894b2c6eaad6e52dfe51e45524fe382c..b0da31064d349b2a3197b4fd85211269566916eb 100644
--- a/sflphone-common/libs/pjproject/pjlib/include/pj/compat/string.h
+++ b/sflphone-common/libs/pjproject/pjlib/include/pj/compat/string.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJ_COMPAT_STRING_H__
#define __PJ_COMPAT_STRING_H__
diff --git a/sflphone-common/libs/pjproject/pjlib/include/pj/compat/time.h b/sflphone-common/libs/pjproject/pjlib/include/pj/compat/time.h
index 8a4465719fc4de94fa0d0b7d1e840a39aa0c9a73..dc81459e485ba35baaabcee3fee4ecab12873542 100644
--- a/sflphone-common/libs/pjproject/pjlib/include/pj/compat/time.h
+++ b/sflphone-common/libs/pjproject/pjlib/include/pj/compat/time.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJ_COMPAT_TIME_H__
#define __PJ_COMPAT_TIME_H__
diff --git a/sflphone-common/libs/pjproject/pjlib/include/pj/config.h b/sflphone-common/libs/pjproject/pjlib/include/pj/config.h
index 7c21e8efa31bfbee83deb2c7676c1c986ce29210..3b211abd85e23247b084898137a17b2d78f1fba0 100644
--- a/sflphone-common/libs/pjproject/pjlib/include/pj/config.h
+++ b/sflphone-common/libs/pjproject/pjlib/include/pj/config.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJ_CONFIG_H__
#define __PJ_CONFIG_H__
diff --git a/sflphone-common/libs/pjproject/pjlib/include/pj/ctype.h b/sflphone-common/libs/pjproject/pjlib/include/pj/ctype.h
index abfec7e7c2c3f57c7cc0269db461690658f3d658..e0540525cc5931c375df031d5db57e060eae142b 100644
--- a/sflphone-common/libs/pjproject/pjlib/include/pj/ctype.h
+++ b/sflphone-common/libs/pjproject/pjlib/include/pj/ctype.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJ_CTYPE_H__
#define __PJ_CTYPE_H__
diff --git a/sflphone-common/libs/pjproject/pjlib/include/pj/doxygen.h b/sflphone-common/libs/pjproject/pjlib/include/pj/doxygen.h
index 12014d31fc4109510cd2b2843b27eb76b2664b76..9d1db0d106d5e3ac424e02747d255347eed4018d 100644
--- a/sflphone-common/libs/pjproject/pjlib/include/pj/doxygen.h
+++ b/sflphone-common/libs/pjproject/pjlib/include/pj/doxygen.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJ_DOXYGEN_H__
#define __PJ_DOXYGEN_H__
diff --git a/sflphone-common/libs/pjproject/pjlib/include/pj/errno.h b/sflphone-common/libs/pjproject/pjlib/include/pj/errno.h
index 7576a4cf7accd1e6a974ef5e7a3a4b42313db806..58e48350fedf57e749e8af3525e0de077582b9c1 100644
--- a/sflphone-common/libs/pjproject/pjlib/include/pj/errno.h
+++ b/sflphone-common/libs/pjproject/pjlib/include/pj/errno.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJ_ERRNO_H__
#define __PJ_ERRNO_H__
diff --git a/sflphone-common/libs/pjproject/pjlib/include/pj/except.h b/sflphone-common/libs/pjproject/pjlib/include/pj/except.h
index c71d76cf9e10016902bf72593244917f348b835c..64e2493f03e11230240c054719eb1f51ea934c08 100644
--- a/sflphone-common/libs/pjproject/pjlib/include/pj/except.h
+++ b/sflphone-common/libs/pjproject/pjlib/include/pj/except.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJ_EXCEPTION_H__
#define __PJ_EXCEPTION_H__
diff --git a/sflphone-common/libs/pjproject/pjlib/include/pj/fifobuf.h b/sflphone-common/libs/pjproject/pjlib/include/pj/fifobuf.h
index fd7242d47e633605fa8f5b3fdcadd1e173fb908d..56810b6b357a4fb30ceab22b8a4a57da9ceb3211 100644
--- a/sflphone-common/libs/pjproject/pjlib/include/pj/fifobuf.h
+++ b/sflphone-common/libs/pjproject/pjlib/include/pj/fifobuf.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJ_FIFOBUF_H__
#define __PJ_FIFOBUF_H__
diff --git a/sflphone-common/libs/pjproject/pjlib/include/pj/file_access.h b/sflphone-common/libs/pjproject/pjlib/include/pj/file_access.h
index 8c53755ec4fdd602fe643986cf29d07706bbccf1..f75dc815081eb6c2da1f0a5782caa377a978ff42 100644
--- a/sflphone-common/libs/pjproject/pjlib/include/pj/file_access.h
+++ b/sflphone-common/libs/pjproject/pjlib/include/pj/file_access.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJ_FILE_ACCESS_H__
#define __PJ_FILE_ACCESS_H__
diff --git a/sflphone-common/libs/pjproject/pjlib/include/pj/file_io.h b/sflphone-common/libs/pjproject/pjlib/include/pj/file_io.h
index ea95c416d9ecd4414ae47dfb9b2fb7c38f5a8ae8..e20541de8bb6d83e004831f6c7ef0f6ea8790f5a 100644
--- a/sflphone-common/libs/pjproject/pjlib/include/pj/file_io.h
+++ b/sflphone-common/libs/pjproject/pjlib/include/pj/file_io.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJ_FILE_IO_H__
#define __PJ_FILE_IO_H__
diff --git a/sflphone-common/libs/pjproject/pjlib/include/pj/guid.h b/sflphone-common/libs/pjproject/pjlib/include/pj/guid.h
index 5302f735ca4ac6ceff5b6a2c91e1ef62b6588c27..eee046a0b56a65f6da5940aa6751d16ecc7af17d 100644
--- a/sflphone-common/libs/pjproject/pjlib/include/pj/guid.h
+++ b/sflphone-common/libs/pjproject/pjlib/include/pj/guid.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJ_GUID_H__
#define __PJ_GUID_H__
diff --git a/sflphone-common/libs/pjproject/pjlib/include/pj/hash.h b/sflphone-common/libs/pjproject/pjlib/include/pj/hash.h
index 72d739dc9ab482ed18649a8f733cd7765413cda9..559aae5b04e28d0ca24931a712860ea75543ae64 100644
--- a/sflphone-common/libs/pjproject/pjlib/include/pj/hash.h
+++ b/sflphone-common/libs/pjproject/pjlib/include/pj/hash.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJ_HASH_H__
#define __PJ_HASH_H__
diff --git a/sflphone-common/libs/pjproject/pjlib/include/pj/ip_helper.h b/sflphone-common/libs/pjproject/pjlib/include/pj/ip_helper.h
index b1a7ec948d0164d4d88fe5131e2d3d7d9c35ce83..0446dc886465ca9835d2181367cf92244f3a3c5f 100644
--- a/sflphone-common/libs/pjproject/pjlib/include/pj/ip_helper.h
+++ b/sflphone-common/libs/pjproject/pjlib/include/pj/ip_helper.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJ_IP_ROUTE_H__
#define __PJ_IP_ROUTE_H__
diff --git a/sflphone-common/libs/pjproject/pjlib/include/pj/list.h b/sflphone-common/libs/pjproject/pjlib/include/pj/list.h
index 7c95e875726c67bd9a8dc069148a752768fe65b5..2cf075e62fa79a8228c46c1a16122cab373b2d9c 100644
--- a/sflphone-common/libs/pjproject/pjlib/include/pj/list.h
+++ b/sflphone-common/libs/pjproject/pjlib/include/pj/list.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJ_LIST_H__
#define __PJ_LIST_H__
diff --git a/sflphone-common/libs/pjproject/pjlib/include/pj/list_i.h b/sflphone-common/libs/pjproject/pjlib/include/pj/list_i.h
index 8f5a25abf868593ae5e54be00ca45727d49c15c2..e910761296a45cec55989e2280c1038999891921 100644
--- a/sflphone-common/libs/pjproject/pjlib/include/pj/list_i.h
+++ b/sflphone-common/libs/pjproject/pjlib/include/pj/list_i.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
diff --git a/sflphone-common/libs/pjproject/pjlib/include/pj/lock.h b/sflphone-common/libs/pjproject/pjlib/include/pj/lock.h
index 13fd7142278c1a1c66f6c65ad71bb4c2b316386a..a0a31b851e4819bc0df5a8420a4655e6b23e54b8 100644
--- a/sflphone-common/libs/pjproject/pjlib/include/pj/lock.h
+++ b/sflphone-common/libs/pjproject/pjlib/include/pj/lock.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJ_LOCK_H__
#define __PJ_LOCK_H__
diff --git a/sflphone-common/libs/pjproject/pjlib/include/pj/log.h b/sflphone-common/libs/pjproject/pjlib/include/pj/log.h
index e0b6e69d1a75a32bd0119af4b863584725477fe4..118a3b36c1ac1fdcb7d5a0529fabc871d1ef7519 100644
--- a/sflphone-common/libs/pjproject/pjlib/include/pj/log.h
+++ b/sflphone-common/libs/pjproject/pjlib/include/pj/log.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJ_LOG_H__
#define __PJ_LOG_H__
diff --git a/sflphone-common/libs/pjproject/pjlib/include/pj/math.h b/sflphone-common/libs/pjproject/pjlib/include/pj/math.h
index e74ce829b4404ca21b67bb7b3644d0f5261bf7bc..1bc50898785746b81c2a65584f4c3fbbfd8f750d 100644
--- a/sflphone-common/libs/pjproject/pjlib/include/pj/math.h
+++ b/sflphone-common/libs/pjproject/pjlib/include/pj/math.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJ_MATH_H__
diff --git a/sflphone-common/libs/pjproject/pjlib/include/pj/os.h b/sflphone-common/libs/pjproject/pjlib/include/pj/os.h
index 6b4c5e45e65c8ebb7ebde578c61e6560ed634abb..5f025f902dacb066415ec65aa5eace0080152629 100644
--- a/sflphone-common/libs/pjproject/pjlib/include/pj/os.h
+++ b/sflphone-common/libs/pjproject/pjlib/include/pj/os.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJ_OS_H__
#define __PJ_OS_H__
diff --git a/sflphone-common/libs/pjproject/pjlib/include/pj/pool.h b/sflphone-common/libs/pjproject/pjlib/include/pj/pool.h
index d8225cbab90a7d34d799ac763edc75b3be460cfc..2ee1d07a5b0bc9ce46b3bdd0f63da345b4d01e3a 100644
--- a/sflphone-common/libs/pjproject/pjlib/include/pj/pool.h
+++ b/sflphone-common/libs/pjproject/pjlib/include/pj/pool.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pj/list.h>
diff --git a/sflphone-common/libs/pjproject/pjlib/include/pj/pool_alt.h b/sflphone-common/libs/pjproject/pjlib/include/pj/pool_alt.h
index 417d96dc1bd3b275e4eae90d6b44b6c1295d760a..ab6e48f66b4dad4cb08590162e679c3ce7cf489b 100644
--- a/sflphone-common/libs/pjproject/pjlib/include/pj/pool_alt.h
+++ b/sflphone-common/libs/pjproject/pjlib/include/pj/pool_alt.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJ_POOL_ALT_H__
#define __PJ_POOL_ALT_H__
diff --git a/sflphone-common/libs/pjproject/pjlib/include/pj/pool_buf.h b/sflphone-common/libs/pjproject/pjlib/include/pj/pool_buf.h
index 0698fe26cb6835b58b460d85922f166cec58b62f..64fb3cd188f0f54defe5d5716c3024ee888b81a0 100644
--- a/sflphone-common/libs/pjproject/pjlib/include/pj/pool_buf.h
+++ b/sflphone-common/libs/pjproject/pjlib/include/pj/pool_buf.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __POOL_STACK_H__
#define __POOL_STACK_H__
diff --git a/sflphone-common/libs/pjproject/pjlib/include/pj/pool_i.h b/sflphone-common/libs/pjproject/pjlib/include/pj/pool_i.h
index 1a54be700ca8b8360b6f38cb63d11e3ec20cb2bf..44f2e97f87752c7882e34dcf4acb4d556625ff39 100644
--- a/sflphone-common/libs/pjproject/pjlib/include/pj/pool_i.h
+++ b/sflphone-common/libs/pjproject/pjlib/include/pj/pool_i.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
diff --git a/sflphone-common/libs/pjproject/pjlib/include/pj/rand.h b/sflphone-common/libs/pjproject/pjlib/include/pj/rand.h
index 55169f259765a7ca36d5298ab76853c06d03cae1..f2ce097a35859eba96e8a3345d93a844208a2b61 100644
--- a/sflphone-common/libs/pjproject/pjlib/include/pj/rand.h
+++ b/sflphone-common/libs/pjproject/pjlib/include/pj/rand.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJ_RAND_H__
#define __PJ_RAND_H__
diff --git a/sflphone-common/libs/pjproject/pjlib/include/pj/rbtree.h b/sflphone-common/libs/pjproject/pjlib/include/pj/rbtree.h
index 340409d9b75f487fd89e8c364f9efd3ca2ede058..3d30f40d7d0735a583ae4c7dc2c1b18ab4f1ab5c 100644
--- a/sflphone-common/libs/pjproject/pjlib/include/pj/rbtree.h
+++ b/sflphone-common/libs/pjproject/pjlib/include/pj/rbtree.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJ_RBTREE_H__
#define __PJ_RBTREE_H__
diff --git a/sflphone-common/libs/pjproject/pjlib/include/pj/sock.h b/sflphone-common/libs/pjproject/pjlib/include/pj/sock.h
index 90c9f05ce8efdbf33344f25ffd8cc8dd7cff64f8..64d019a48c8bef47f936d611b4d743a5f2730497 100644
--- a/sflphone-common/libs/pjproject/pjlib/include/pj/sock.h
+++ b/sflphone-common/libs/pjproject/pjlib/include/pj/sock.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJ_SOCK_H__
#define __PJ_SOCK_H__
diff --git a/sflphone-common/libs/pjproject/pjlib/include/pj/sock_qos.h b/sflphone-common/libs/pjproject/pjlib/include/pj/sock_qos.h
index 4422253b6853f85a21166892f9df4e41724c0646..7c2f7149059f5382e3ed4bd4db7d5c079735f402 100644
--- a/sflphone-common/libs/pjproject/pjlib/include/pj/sock_qos.h
+++ b/sflphone-common/libs/pjproject/pjlib/include/pj/sock_qos.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJ_SOCK_QOS_H__
#define __PJ_SOCK_QOS_H__
diff --git a/sflphone-common/libs/pjproject/pjlib/include/pj/sock_select.h b/sflphone-common/libs/pjproject/pjlib/include/pj/sock_select.h
index 87158253b1ff526c6dc47a4b87682a8eec6b55c7..b7ef4fcdaab28d4a77bc3565d01da9e965b3389b 100644
--- a/sflphone-common/libs/pjproject/pjlib/include/pj/sock_select.h
+++ b/sflphone-common/libs/pjproject/pjlib/include/pj/sock_select.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJ_SELECT_H__
#define __PJ_SELECT_H__
diff --git a/sflphone-common/libs/pjproject/pjlib/include/pj/ssl_sock.h b/sflphone-common/libs/pjproject/pjlib/include/pj/ssl_sock.h
index 3ac2b7f2bfc54aaf249d2db25ac301eac8eec605..f9252f581757c623277f3afcd4c85823912811de 100644
--- a/sflphone-common/libs/pjproject/pjlib/include/pj/ssl_sock.h
+++ b/sflphone-common/libs/pjproject/pjlib/include/pj/ssl_sock.h
@@ -15,6 +15,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJ_SSL_SOCK_H__
#define __PJ_SSL_SOCK_H__
diff --git a/sflphone-common/libs/pjproject/pjlib/include/pj/string.h b/sflphone-common/libs/pjproject/pjlib/include/pj/string.h
index 1516765ab76fd0f8ead47033b7fdb27aab2e42d3..6af4acba1d36c1671d5a2f8cd023d5afcc58e459 100644
--- a/sflphone-common/libs/pjproject/pjlib/include/pj/string.h
+++ b/sflphone-common/libs/pjproject/pjlib/include/pj/string.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJ_STRING_H__
#define __PJ_STRING_H__
diff --git a/sflphone-common/libs/pjproject/pjlib/include/pj/string_i.h b/sflphone-common/libs/pjproject/pjlib/include/pj/string_i.h
index f2f755ac4299372f6b9bb69ebf784c7cfd643e55..0090a031be0462c7c4ef7973e041b0d8550f3ca6 100644
--- a/sflphone-common/libs/pjproject/pjlib/include/pj/string_i.h
+++ b/sflphone-common/libs/pjproject/pjlib/include/pj/string_i.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pj/pool.h>
diff --git a/sflphone-common/libs/pjproject/pjlib/include/pj/types.h b/sflphone-common/libs/pjproject/pjlib/include/pj/types.h
index 9c43f93c8e317bd6d2de6039dd0fc27aa4722cbb..5f5c8e60367df8a441819a8c1863b7628dff76ff 100644
--- a/sflphone-common/libs/pjproject/pjlib/include/pj/types.h
+++ b/sflphone-common/libs/pjproject/pjlib/include/pj/types.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJ_TYPES_H__
#define __PJ_TYPES_H__
diff --git a/sflphone-common/libs/pjproject/pjlib/include/pj/unicode.h b/sflphone-common/libs/pjproject/pjlib/include/pj/unicode.h
index 0eea2276a80ba70a398d7a749739a8f76a17af1c..48e5e10e7a59bba8915751a0e43000721298562a 100644
--- a/sflphone-common/libs/pjproject/pjlib/include/pj/unicode.h
+++ b/sflphone-common/libs/pjproject/pjlib/include/pj/unicode.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJ_UNICODE_H__
#define __PJ_UNICODE_H__
diff --git a/sflphone-common/libs/pjproject/pjlib/include/pjlib++.hpp b/sflphone-common/libs/pjproject/pjlib/include/pjlib++.hpp
index fe2e74d0ef1c308e5bf4e180fc3850c724881a0f..afdfbd8cd3fe769b4c02a0317aee725b65a1231e 100644
--- a/sflphone-common/libs/pjproject/pjlib/include/pjlib++.hpp
+++ b/sflphone-common/libs/pjproject/pjlib/include/pjlib++.hpp
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJLIBPP_H__
#define __PJLIBPP_H__
diff --git a/sflphone-common/libs/pjproject/pjlib/include/pjlib.h b/sflphone-common/libs/pjproject/pjlib/include/pjlib.h
index dcfa3bed96faa38468bb18407868bc2a10ea2992..924b575252ac38d75be7e2c7478d660284e04197 100644
--- a/sflphone-common/libs/pjproject/pjlib/include/pjlib.h
+++ b/sflphone-common/libs/pjproject/pjlib/include/pjlib.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJLIB_H__
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pj/activesock.c b/sflphone-common/libs/pjproject/pjlib/src/pj/activesock.c
index 2c19fc9fc016901f7341898c82147d17ec74e170..f5181827dee7c0f1df0be635719fb4fa3202f061 100644
--- a/sflphone-common/libs/pjproject/pjlib/src/pj/activesock.c
+++ b/sflphone-common/libs/pjproject/pjlib/src/pj/activesock.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pj/activesock.h>
#include <pj/compat/socket.h>
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pj/addr_resolv_linux_kernel.c b/sflphone-common/libs/pjproject/pjlib/src/pj/addr_resolv_linux_kernel.c
index 0848cd54734188a78463fa76b48c643b2b2cc964..6c5061558ae0757bc4c75e95e47e7709ab09c210 100644
--- a/sflphone-common/libs/pjproject/pjlib/src/pj/addr_resolv_linux_kernel.c
+++ b/sflphone-common/libs/pjproject/pjlib/src/pj/addr_resolv_linux_kernel.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pj/addr_resolv.h>
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pj/addr_resolv_sock.c b/sflphone-common/libs/pjproject/pjlib/src/pj/addr_resolv_sock.c
index 3c3a946741cb3bb20c2f2694e51da3f7c394c964..7e9dc177c92bac3a83b90749b894d7c4dfcf5d42 100644
--- a/sflphone-common/libs/pjproject/pjlib/src/pj/addr_resolv_sock.c
+++ b/sflphone-common/libs/pjproject/pjlib/src/pj/addr_resolv_sock.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pj/addr_resolv.h>
#include <pj/assert.h>
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pj/addr_resolv_symbian.cpp b/sflphone-common/libs/pjproject/pjlib/src/pj/addr_resolv_symbian.cpp
index a0f4453dcef2545167dacd407b60f9560aadf640..d53bd764252ddf2345a63b36470da437e1b29f28 100644
--- a/sflphone-common/libs/pjproject/pjlib/src/pj/addr_resolv_symbian.cpp
+++ b/sflphone-common/libs/pjproject/pjlib/src/pj/addr_resolv_symbian.cpp
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pj/addr_resolv.h>
#include <pj/assert.h>
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pj/array.c b/sflphone-common/libs/pjproject/pjlib/src/pj/array.c
index bc47d157b4167ae9804ebe1adbc56b254fabe9f2..d7f7fd0f4ae1c79136c86b4b3da2ce23959a80e7 100644
--- a/sflphone-common/libs/pjproject/pjlib/src/pj/array.c
+++ b/sflphone-common/libs/pjproject/pjlib/src/pj/array.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pj/array.h>
#include <pj/string.h>
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pj/compat/sigjmp.c b/sflphone-common/libs/pjproject/pjlib/src/pj/compat/sigjmp.c
index 7dc2eed6e69ac3d2c1168f5a4a78569c14fc29ee..2a77fa208392848f45605d450767f0cde8edb909 100644
--- a/sflphone-common/libs/pjproject/pjlib/src/pj/compat/sigjmp.c
+++ b/sflphone-common/libs/pjproject/pjlib/src/pj/compat/sigjmp.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pj/config.h>
#include <pj/compat/setjmp.h>
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pj/compat/string.c b/sflphone-common/libs/pjproject/pjlib/src/pj/compat/string.c
index ee33e927da49605daacee595e199273bd1d57edf..91734d91814dd2738a34b483d566f5f700056add 100644
--- a/sflphone-common/libs/pjproject/pjlib/src/pj/compat/string.c
+++ b/sflphone-common/libs/pjproject/pjlib/src/pj/compat/string.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pj/types.h>
#include <pj/compat/string.h>
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pj/compat/string_compat.c b/sflphone-common/libs/pjproject/pjlib/src/pj/compat/string_compat.c
index 3501f3d4736ffa2e1b30d37faf616a13874ddc18..6df49697665b0f04a5610010079e7f6a7bc09c0a 100644
--- a/sflphone-common/libs/pjproject/pjlib/src/pj/compat/string_compat.c
+++ b/sflphone-common/libs/pjproject/pjlib/src/pj/compat/string_compat.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pj/types.h>
#include <pj/compat/string.h>
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pj/config.c b/sflphone-common/libs/pjproject/pjlib/src/pj/config.c
index a8d3517444189380b90565a8b9e51a101a8907e6..f2efacfa94105fe1b6509f6dc04191cf161ed5a7 100644
--- a/sflphone-common/libs/pjproject/pjlib/src/pj/config.c
+++ b/sflphone-common/libs/pjproject/pjlib/src/pj/config.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pj/config.h>
#include <pj/log.h>
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pj/ctype.c b/sflphone-common/libs/pjproject/pjlib/src/pj/ctype.c
index d12733765c5d3c446d9f86cb78df98b37ac70274..3bd45545799af2c8aa3143c4181fb8d146c24e4d 100644
--- a/sflphone-common/libs/pjproject/pjlib/src/pj/ctype.c
+++ b/sflphone-common/libs/pjproject/pjlib/src/pj/ctype.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pj/ctype.h>
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pj/errno.c b/sflphone-common/libs/pjproject/pjlib/src/pj/errno.c
index 3d44f6e378e10a2952069bb8c75868c96de155e3..afae260271c0ecb4a8406cbcc9d61d91e120001f 100644
--- a/sflphone-common/libs/pjproject/pjlib/src/pj/errno.c
+++ b/sflphone-common/libs/pjproject/pjlib/src/pj/errno.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pj/errno.h>
#include <pj/log.h>
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pj/except.c b/sflphone-common/libs/pjproject/pjlib/src/pj/except.c
index 1022a1a07f40ec484b79a19270748322f6b7cdd9..d13724ac4921aa166347d6283d45e9fd2b59044e 100644
--- a/sflphone-common/libs/pjproject/pjlib/src/pj/except.c
+++ b/sflphone-common/libs/pjproject/pjlib/src/pj/except.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pj/except.h>
#include <pj/os.h>
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pj/exception_symbian.cpp b/sflphone-common/libs/pjproject/pjlib/src/pj/exception_symbian.cpp
index e54cebddf940cd73896ee81e1f59afad48d16d74..f4bc5908d876ba7ed1d88c7bf1e940217dd53fde 100644
--- a/sflphone-common/libs/pjproject/pjlib/src/pj/exception_symbian.cpp
+++ b/sflphone-common/libs/pjproject/pjlib/src/pj/exception_symbian.cpp
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pj/except.h>
#include <pj/os.h>
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pj/extra-exports.c b/sflphone-common/libs/pjproject/pjlib/src/pj/extra-exports.c
index 38861d146daed119d96ce8c1402b9a6d4fab43f5..7c43f4b03104b24e901ee70f7893eb3c1c8630eb 100644
--- a/sflphone-common/libs/pjproject/pjlib/src/pj/extra-exports.c
+++ b/sflphone-common/libs/pjproject/pjlib/src/pj/extra-exports.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <linux/module.h>
#include <linux/syscalls.h>
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pj/fifobuf.c b/sflphone-common/libs/pjproject/pjlib/src/pj/fifobuf.c
index dfa98c03e9a09f51ad393b90b2925cf11f1348bb..4d952ebcc882cd0f7170ef195357e3d16b02b5e6 100644
--- a/sflphone-common/libs/pjproject/pjlib/src/pj/fifobuf.c
+++ b/sflphone-common/libs/pjproject/pjlib/src/pj/fifobuf.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pj/fifobuf.h>
#include <pj/log.h>
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pj/file_access_unistd.c b/sflphone-common/libs/pjproject/pjlib/src/pj/file_access_unistd.c
index 15b20852b6f0dad07e37079fde2a0efd319dad05..f0b7e17c3ca3c056d4089211b873c759a8658a21 100644
--- a/sflphone-common/libs/pjproject/pjlib/src/pj/file_access_unistd.c
+++ b/sflphone-common/libs/pjproject/pjlib/src/pj/file_access_unistd.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pj/file_access.h>
#include <pj/assert.h>
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pj/file_access_win32.c b/sflphone-common/libs/pjproject/pjlib/src/pj/file_access_win32.c
index 9c5d3dfb4ede8d9e11f7279b281a4ff102f4223c..de9110cc53b56973be06f741987dcfb534c33be0 100644
--- a/sflphone-common/libs/pjproject/pjlib/src/pj/file_access_win32.c
+++ b/sflphone-common/libs/pjproject/pjlib/src/pj/file_access_win32.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pj/file_access.h>
#include <pj/unicode.h>
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pj/file_io_ansi.c b/sflphone-common/libs/pjproject/pjlib/src/pj/file_io_ansi.c
index 0e1c989a62dd6ac170969858fd7376377c62c863..c28b3f876f78550207c23b49d8e7779d9d2213a8 100644
--- a/sflphone-common/libs/pjproject/pjlib/src/pj/file_io_ansi.c
+++ b/sflphone-common/libs/pjproject/pjlib/src/pj/file_io_ansi.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pj/file_io.h>
#include <pj/assert.h>
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pj/file_io_win32.c b/sflphone-common/libs/pjproject/pjlib/src/pj/file_io_win32.c
index e8ac7a125da2022cf7511daa7c871898ed77671c..0d02ec1f26ff4ff044078af8da8b4ccf08788431 100644
--- a/sflphone-common/libs/pjproject/pjlib/src/pj/file_io_win32.c
+++ b/sflphone-common/libs/pjproject/pjlib/src/pj/file_io_win32.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pj/file_io.h>
#include <pj/unicode.h>
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pj/guid.c b/sflphone-common/libs/pjproject/pjlib/src/pj/guid.c
index b9fc9f421e5101d235c3d8c6244eb4a94d85704f..9ee5ff6c2185c19780d19a88c64ec85bee0a4b24 100644
--- a/sflphone-common/libs/pjproject/pjlib/src/pj/guid.c
+++ b/sflphone-common/libs/pjproject/pjlib/src/pj/guid.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pj/guid.h>
#include <pj/pool.h>
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pj/guid_simple.c b/sflphone-common/libs/pjproject/pjlib/src/pj/guid_simple.c
index 8c76f9818b9997ac80e2cfbd4c883e2e8fd0910f..91b55fcfd463baeed281db662ea2d6b675c5a271 100644
--- a/sflphone-common/libs/pjproject/pjlib/src/pj/guid_simple.c
+++ b/sflphone-common/libs/pjproject/pjlib/src/pj/guid_simple.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pj/guid.h>
#include <pj/assert.h>
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pj/guid_uuid.c b/sflphone-common/libs/pjproject/pjlib/src/pj/guid_uuid.c
index ff1bd6a028ad5d5149a0a1915bd169736e0cb20a..8d4f07ba678dc98f2fdd13b1dc2f2ad47a89d195 100644
--- a/sflphone-common/libs/pjproject/pjlib/src/pj/guid_uuid.c
+++ b/sflphone-common/libs/pjproject/pjlib/src/pj/guid_uuid.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pj/guid.h>
#include <pj/assert.h>
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pj/guid_win32.c b/sflphone-common/libs/pjproject/pjlib/src/pj/guid_win32.c
index 89be0ef5c2d5ea6b74b52a407ef83cc9b8b83a60..d5c5c25f4f053ce8f3a5b465c07b2b668b08cff1 100644
--- a/sflphone-common/libs/pjproject/pjlib/src/pj/guid_win32.c
+++ b/sflphone-common/libs/pjproject/pjlib/src/pj/guid_win32.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pj/guid.h>
#include <pj/string.h>
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pj/hash.c b/sflphone-common/libs/pjproject/pjlib/src/pj/hash.c
index 2a23cf01df332d8a916c738244b0a84004306832..54f0a39145efe9f2cee941076c546890a2f8d5ef 100644
--- a/sflphone-common/libs/pjproject/pjlib/src/pj/hash.c
+++ b/sflphone-common/libs/pjproject/pjlib/src/pj/hash.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pj/hash.h>
#include <pj/log.h>
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pj/ioqueue_common_abs.c b/sflphone-common/libs/pjproject/pjlib/src/pj/ioqueue_common_abs.c
index 043876b6490d181982b256f598cb8693b543bfdf..f54d168ed85c57591685862b6403a1ea6a4cf79e 100644
--- a/sflphone-common/libs/pjproject/pjlib/src/pj/ioqueue_common_abs.c
+++ b/sflphone-common/libs/pjproject/pjlib/src/pj/ioqueue_common_abs.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
/*
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pj/ioqueue_common_abs.h b/sflphone-common/libs/pjproject/pjlib/src/pj/ioqueue_common_abs.h
index 4d14a8b843944ac9fc77704ff13aca9b459e95f4..28152ff17c78191cf65f7c9178eef0f6a07a119e 100644
--- a/sflphone-common/libs/pjproject/pjlib/src/pj/ioqueue_common_abs.h
+++ b/sflphone-common/libs/pjproject/pjlib/src/pj/ioqueue_common_abs.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
/* ioqueue_common_abs.h
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pj/ioqueue_dummy.c b/sflphone-common/libs/pjproject/pjlib/src/pj/ioqueue_dummy.c
index 3d1e621951df392e575c21c0f7e32c8e823cf7f9..a173d0daa9d7315ffe1d5d745034c55fc8eb35c9 100644
--- a/sflphone-common/libs/pjproject/pjlib/src/pj/ioqueue_dummy.c
+++ b/sflphone-common/libs/pjproject/pjlib/src/pj/ioqueue_dummy.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pj/ioqueue.h>
#include <pj/os.h>
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pj/ioqueue_epoll.c b/sflphone-common/libs/pjproject/pjlib/src/pj/ioqueue_epoll.c
index cd2e786f075794503ca848ad4af4aed142a3ad1b..2b630ea70883d5b2b7d9e982803ab035bc2175b0 100644
--- a/sflphone-common/libs/pjproject/pjlib/src/pj/ioqueue_epoll.c
+++ b/sflphone-common/libs/pjproject/pjlib/src/pj/ioqueue_epoll.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
/*
* ioqueue_epoll.c
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pj/ioqueue_linux_kernel.c b/sflphone-common/libs/pjproject/pjlib/src/pj/ioqueue_linux_kernel.c
index 7452e2e8d9c0a6ab250aaf2d0b013d95795f36b9..1faf1fd44604e9742143b5739b0d633480234ca0 100644
--- a/sflphone-common/libs/pjproject/pjlib/src/pj/ioqueue_linux_kernel.c
+++ b/sflphone-common/libs/pjproject/pjlib/src/pj/ioqueue_linux_kernel.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pj/ioqueue.h>
#include <pj/os.h>
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pj/ioqueue_select.c b/sflphone-common/libs/pjproject/pjlib/src/pj/ioqueue_select.c
index eaddcd04e33dea9ad32eb0abb1354ace3f7e57e5..6e486230eda435759107e052248c3c9209e927b3 100644
--- a/sflphone-common/libs/pjproject/pjlib/src/pj/ioqueue_select.c
+++ b/sflphone-common/libs/pjproject/pjlib/src/pj/ioqueue_select.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
/*
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pj/ioqueue_symbian.cpp b/sflphone-common/libs/pjproject/pjlib/src/pj/ioqueue_symbian.cpp
index c436d4c45836f7c21e5b7bd6930eba005942d01d..e52c64091ac56440861431bfcd22b46231985991 100644
--- a/sflphone-common/libs/pjproject/pjlib/src/pj/ioqueue_symbian.cpp
+++ b/sflphone-common/libs/pjproject/pjlib/src/pj/ioqueue_symbian.cpp
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pj/ioqueue.h>
#include <pj/assert.h>
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pj/ioqueue_winnt.c b/sflphone-common/libs/pjproject/pjlib/src/pj/ioqueue_winnt.c
index f9bd1a60dd0ccd4525c5a12cd8d1832d1eee342b..afcfba5c4e4131b26976f96c694e6383edf88f13 100644
--- a/sflphone-common/libs/pjproject/pjlib/src/pj/ioqueue_winnt.c
+++ b/sflphone-common/libs/pjproject/pjlib/src/pj/ioqueue_winnt.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pj/ioqueue.h>
#include <pj/os.h>
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pj/ip_helper_generic.c b/sflphone-common/libs/pjproject/pjlib/src/pj/ip_helper_generic.c
index d9f98694f73ee16b04d249724859aa62d8488da0..1b3ed8ace08fe96c18ff74252ded6d1d67f7d41d 100644
--- a/sflphone-common/libs/pjproject/pjlib/src/pj/ip_helper_generic.c
+++ b/sflphone-common/libs/pjproject/pjlib/src/pj/ip_helper_generic.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pj/ip_helper.h>
#include <pj/addr_resolv.h>
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pj/ip_helper_symbian.cpp b/sflphone-common/libs/pjproject/pjlib/src/pj/ip_helper_symbian.cpp
index 9f634a0b8b152df42b2736a63ca1a612d8028edb..511f12331abffc5765da4130d8161c4490e3e5e3 100644
--- a/sflphone-common/libs/pjproject/pjlib/src/pj/ip_helper_symbian.cpp
+++ b/sflphone-common/libs/pjproject/pjlib/src/pj/ip_helper_symbian.cpp
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pj/ip_helper.h>
#include <pj/addr_resolv.h>
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pj/ip_helper_win32.c b/sflphone-common/libs/pjproject/pjlib/src/pj/ip_helper_win32.c
index 67168791ef11bd0d9beba742274e203b83390c01..089abc09f443897ce1d61b3c1b0675747c5429ce 100644
--- a/sflphone-common/libs/pjproject/pjlib/src/pj/ip_helper_win32.c
+++ b/sflphone-common/libs/pjproject/pjlib/src/pj/ip_helper_win32.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pj/config.h>
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pj/list.c b/sflphone-common/libs/pjproject/pjlib/src/pj/list.c
index 4a6bf3e4c03de8465ab9955cb826ea1c5984f0ef..63dec64ab6e321294ae3cbf21bd7eb497c1f2eba 100644
--- a/sflphone-common/libs/pjproject/pjlib/src/pj/list.c
+++ b/sflphone-common/libs/pjproject/pjlib/src/pj/list.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pj/list.h>
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pj/lock.c b/sflphone-common/libs/pjproject/pjlib/src/pj/lock.c
index f42291b8e0403bb418e682e8a2150419d280a7f6..d41fde3edbb1beb6bd7da2bf2156595edc0c82c3 100644
--- a/sflphone-common/libs/pjproject/pjlib/src/pj/lock.c
+++ b/sflphone-common/libs/pjproject/pjlib/src/pj/lock.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pj/lock.h>
#include <pj/os.h>
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pj/log.c b/sflphone-common/libs/pjproject/pjlib/src/pj/log.c
index b35e9e619fdea1bce2dc8dfb4dbb3f4fa9126945..eb97f515bf559d067ba224df697b03f1a3555084 100644
--- a/sflphone-common/libs/pjproject/pjlib/src/pj/log.c
+++ b/sflphone-common/libs/pjproject/pjlib/src/pj/log.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pj/types.h>
#include <pj/log.h>
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pj/log_writer_printk.c b/sflphone-common/libs/pjproject/pjlib/src/pj/log_writer_printk.c
index d41d1f9f6be7ecfe7e8ec7c8037b77479703cebd..a213c1af769f769595bea9f08d4f1ddfe8cfb6cc 100644
--- a/sflphone-common/libs/pjproject/pjlib/src/pj/log_writer_printk.c
+++ b/sflphone-common/libs/pjproject/pjlib/src/pj/log_writer_printk.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pj/log.h>
#include <pj/os.h>
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pj/log_writer_stdout.c b/sflphone-common/libs/pjproject/pjlib/src/pj/log_writer_stdout.c
index 701d7af4235ab8785b2f9dacc67bcc7843778df5..0ad633a72a76cdfbd09b65323541a168b126e8fd 100644
--- a/sflphone-common/libs/pjproject/pjlib/src/pj/log_writer_stdout.c
+++ b/sflphone-common/libs/pjproject/pjlib/src/pj/log_writer_stdout.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pj/log.h>
#include <pj/os.h>
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pj/log_writer_symbian_console.cpp b/sflphone-common/libs/pjproject/pjlib/src/pj/log_writer_symbian_console.cpp
index 8f627cf149067127f7bf0402c0268f77f748361d..26e4c7307cbfc6ae66a0501287c56a5cc61c7ef1 100644
--- a/sflphone-common/libs/pjproject/pjlib/src/pj/log_writer_symbian_console.cpp
+++ b/sflphone-common/libs/pjproject/pjlib/src/pj/log_writer_symbian_console.cpp
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pj/log.h>
#include <pj/os.h>
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pj/os_core_linux_kernel.c b/sflphone-common/libs/pjproject/pjlib/src/pj/os_core_linux_kernel.c
index d953397dc7b553307e326465181a239dfc9572b1..8c093b62097701da03dc1fc5317294d244aec37a 100644
--- a/sflphone-common/libs/pjproject/pjlib/src/pj/os_core_linux_kernel.c
+++ b/sflphone-common/libs/pjproject/pjlib/src/pj/os_core_linux_kernel.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pj/os.h>
#include <pj/assert.h>
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pj/os_core_symbian.cpp b/sflphone-common/libs/pjproject/pjlib/src/pj/os_core_symbian.cpp
index 8b036152180cccc77692b806e202ce82b63dcf80..7ef1e1173ff7686a60563068c4285731e2c8fee9 100644
--- a/sflphone-common/libs/pjproject/pjlib/src/pj/os_core_symbian.cpp
+++ b/sflphone-common/libs/pjproject/pjlib/src/pj/os_core_symbian.cpp
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pj/os.h>
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pj/os_core_unix.c b/sflphone-common/libs/pjproject/pjlib/src/pj/os_core_unix.c
index c233529fc6c70b8b179617273ad0b97f985a352e..22789e08dacc9fcd776402e808ec18bdcba0a584 100644
--- a/sflphone-common/libs/pjproject/pjlib/src/pj/os_core_unix.c
+++ b/sflphone-common/libs/pjproject/pjlib/src/pj/os_core_unix.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
/*
* Contributors:
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pj/os_core_win32.c b/sflphone-common/libs/pjproject/pjlib/src/pj/os_core_win32.c
index 51af335105f1ab196d63e1cec6fd50c44da65c97..8633430361e919535950e3691a84fc9fadcaed7a 100644
--- a/sflphone-common/libs/pjproject/pjlib/src/pj/os_core_win32.c
+++ b/sflphone-common/libs/pjproject/pjlib/src/pj/os_core_win32.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pj/os.h>
#include <pj/pool.h>
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pj/os_error_linux_kernel.c b/sflphone-common/libs/pjproject/pjlib/src/pj/os_error_linux_kernel.c
index f0a39754020c6f5449d1ad7a6f366012c576c2dd..9c06f227c49503563cfa9991c353c88b8f8527f9 100644
--- a/sflphone-common/libs/pjproject/pjlib/src/pj/os_error_linux_kernel.c
+++ b/sflphone-common/libs/pjproject/pjlib/src/pj/os_error_linux_kernel.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pj/string.h>
#include <pj/compat/errno.h>
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pj/os_error_symbian.cpp b/sflphone-common/libs/pjproject/pjlib/src/pj/os_error_symbian.cpp
index 31707b97c377903df1c5561cdbcda4101e5b935c..eba44ecc0934b506ecf6bb7ecb9185cdeee49f16 100644
--- a/sflphone-common/libs/pjproject/pjlib/src/pj/os_error_symbian.cpp
+++ b/sflphone-common/libs/pjproject/pjlib/src/pj/os_error_symbian.cpp
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pj/errno.h>
#include <pj/assert.h>
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pj/os_error_unix.c b/sflphone-common/libs/pjproject/pjlib/src/pj/os_error_unix.c
index 45d59d92ebd2e7ed20ef5bec183f758dcbc14385..37a69066abf84ff07e64b975037d90e95137a493 100644
--- a/sflphone-common/libs/pjproject/pjlib/src/pj/os_error_unix.c
+++ b/sflphone-common/libs/pjproject/pjlib/src/pj/os_error_unix.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pj/errno.h>
#include <pj/string.h>
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pj/os_error_win32.c b/sflphone-common/libs/pjproject/pjlib/src/pj/os_error_win32.c
index 87582d5a393c40eb4a907a907ab95389bba54435..7cb177747a7ff055280cfcdff8a60a7a2ac48f6e 100644
--- a/sflphone-common/libs/pjproject/pjlib/src/pj/os_error_win32.c
+++ b/sflphone-common/libs/pjproject/pjlib/src/pj/os_error_win32.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pj/errno.h>
#include <pj/assert.h>
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pj/os_rwmutex.c b/sflphone-common/libs/pjproject/pjlib/src/pj/os_rwmutex.c
index 13d0c54e59fdf22bf13c38c7b2957c1417de71eb..c56ac3c064ae09670808ba05fec2b4f2d3765c5f 100644
--- a/sflphone-common/libs/pjproject/pjlib/src/pj/os_rwmutex.c
+++ b/sflphone-common/libs/pjproject/pjlib/src/pj/os_rwmutex.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
/*
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pj/os_symbian.h b/sflphone-common/libs/pjproject/pjlib/src/pj/os_symbian.h
index be9f38c43977d22f3dd7bf3af865feaa97a4bf4a..deab82e1e0b552b1add4105a79b697ca4f2bba2b 100644
--- a/sflphone-common/libs/pjproject/pjlib/src/pj/os_symbian.h
+++ b/sflphone-common/libs/pjproject/pjlib/src/pj/os_symbian.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __OS_SYMBIAN_H__
#define __OS_SYMBIAN_H__
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pj/os_time_bsd.c b/sflphone-common/libs/pjproject/pjlib/src/pj/os_time_bsd.c
index e24174045900b14e204d76369b6ee032e5f056bc..41dcf60ea8c09fe4ce10b2170dd1fae857881c35 100644
--- a/sflphone-common/libs/pjproject/pjlib/src/pj/os_time_bsd.c
+++ b/sflphone-common/libs/pjproject/pjlib/src/pj/os_time_bsd.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pj/os.h>
#include <pj/compat/time.h>
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pj/os_time_common.c b/sflphone-common/libs/pjproject/pjlib/src/pj/os_time_common.c
index 241771cf457b798c54c82d5e12096538b1c790fc..bc068b85db469dc997037b20210d308d1f1721f0 100644
--- a/sflphone-common/libs/pjproject/pjlib/src/pj/os_time_common.c
+++ b/sflphone-common/libs/pjproject/pjlib/src/pj/os_time_common.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pj/os.h>
#include <pj/compat/time.h>
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pj/os_time_linux_kernel.c b/sflphone-common/libs/pjproject/pjlib/src/pj/os_time_linux_kernel.c
index 481bd51bc0871e86102d3d47b736267cc2047431..a2dc9dadda3106c41b51667f1e53fa270556f5f2 100644
--- a/sflphone-common/libs/pjproject/pjlib/src/pj/os_time_linux_kernel.c
+++ b/sflphone-common/libs/pjproject/pjlib/src/pj/os_time_linux_kernel.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pj/os.h>
#include <linux/time.h>
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pj/os_time_unix.c b/sflphone-common/libs/pjproject/pjlib/src/pj/os_time_unix.c
index 5669ef598fc16b41946d1c5e0423b600b25bf1ec..13ac1486f8ee9ae8a330170f84fceef5735ecb42 100644
--- a/sflphone-common/libs/pjproject/pjlib/src/pj/os_time_unix.c
+++ b/sflphone-common/libs/pjproject/pjlib/src/pj/os_time_unix.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pj/os.h>
#include <pj/errno.h>
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pj/os_time_win32.c b/sflphone-common/libs/pjproject/pjlib/src/pj/os_time_win32.c
index 73c75655a37a97d8e70bfafe3ea6793cd49a3ee1..7137c55c45ee89e011b5df5a0f1a83d56fc16a43 100644
--- a/sflphone-common/libs/pjproject/pjlib/src/pj/os_time_win32.c
+++ b/sflphone-common/libs/pjproject/pjlib/src/pj/os_time_win32.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pj/os.h>
#include <pj/string.h>
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pj/os_timestamp_common.c b/sflphone-common/libs/pjproject/pjlib/src/pj/os_timestamp_common.c
index b5fedbd58964da56abbe056f5e75bc20c11ebe48..02a4ee8aca71c000ca30def0e1038f35ede57208 100644
--- a/sflphone-common/libs/pjproject/pjlib/src/pj/os_timestamp_common.c
+++ b/sflphone-common/libs/pjproject/pjlib/src/pj/os_timestamp_common.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pj/os.h>
#include <pj/compat/high_precision.h>
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pj/os_timestamp_linux_kernel.c b/sflphone-common/libs/pjproject/pjlib/src/pj/os_timestamp_linux_kernel.c
index efd72211177b52bdb35b6fbcd73f236928ae29e2..eb0f398f08ae7143c03ef637debe944b67b157d2 100644
--- a/sflphone-common/libs/pjproject/pjlib/src/pj/os_timestamp_linux_kernel.c
+++ b/sflphone-common/libs/pjproject/pjlib/src/pj/os_timestamp_linux_kernel.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pj/os.h>
#include <linux/time.h>
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pj/os_timestamp_posix.c b/sflphone-common/libs/pjproject/pjlib/src/pj/os_timestamp_posix.c
index d9b5d20e0e6c245294559c6cd797c1488bf5e6ed..cfe3533859290326473bfe28a72993e922332d57 100644
--- a/sflphone-common/libs/pjproject/pjlib/src/pj/os_timestamp_posix.c
+++ b/sflphone-common/libs/pjproject/pjlib/src/pj/os_timestamp_posix.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pj/os.h>
#include <pj/errno.h>
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pj/os_timestamp_win32.c b/sflphone-common/libs/pjproject/pjlib/src/pj/os_timestamp_win32.c
index b74cedb6c42659c49a797b306cc46a942f2c6258..849f9987776e28760b0744b5cb27e38837d27b14 100644
--- a/sflphone-common/libs/pjproject/pjlib/src/pj/os_timestamp_win32.c
+++ b/sflphone-common/libs/pjproject/pjlib/src/pj/os_timestamp_win32.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pj/os.h>
#include <pj/assert.h>
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pj/pool.c b/sflphone-common/libs/pjproject/pjlib/src/pj/pool.c
index 2ab100caad3a58cb57a92ae05cbba4f1656989af..9b59ef122c90254c8c4f477d75d5924379f4d6e5 100644
--- a/sflphone-common/libs/pjproject/pjlib/src/pj/pool.c
+++ b/sflphone-common/libs/pjproject/pjlib/src/pj/pool.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pj/pool.h>
#include <pj/log.h>
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pj/pool_buf.c b/sflphone-common/libs/pjproject/pjlib/src/pj/pool_buf.c
index f60333669a6a203dcf8d212ac6548b9236b19171..6045997eda25be82603fa906c202e18d7072affb 100644
--- a/sflphone-common/libs/pjproject/pjlib/src/pj/pool_buf.c
+++ b/sflphone-common/libs/pjproject/pjlib/src/pj/pool_buf.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pj/pool_buf.h>
#include <pj/assert.h>
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pj/pool_caching.c b/sflphone-common/libs/pjproject/pjlib/src/pj/pool_caching.c
index cf092da5219887b277d8ab5a7dcea822590f49c4..f430be3ad8c6cb75c3dee5aeaebe9bae026b04fc 100644
--- a/sflphone-common/libs/pjproject/pjlib/src/pj/pool_caching.c
+++ b/sflphone-common/libs/pjproject/pjlib/src/pj/pool_caching.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pj/pool.h>
#include <pj/log.h>
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pj/pool_dbg.c b/sflphone-common/libs/pjproject/pjlib/src/pj/pool_dbg.c
index ac8b8d17482c1e9ef42cd43de898fcfa2fe849cc..e4ebf11ec4c90dd0b9baf746814e4441164d8b97 100644
--- a/sflphone-common/libs/pjproject/pjlib/src/pj/pool_dbg.c
+++ b/sflphone-common/libs/pjproject/pjlib/src/pj/pool_dbg.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pj/pool.h>
#include <pj/string.h>
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pj/pool_policy_kmalloc.c b/sflphone-common/libs/pjproject/pjlib/src/pj/pool_policy_kmalloc.c
index c7feb33b95f8f530cd10118f3f24da3032185c35..c5544a033c4d47071c9e053942969d980a3e3834 100644
--- a/sflphone-common/libs/pjproject/pjlib/src/pj/pool_policy_kmalloc.c
+++ b/sflphone-common/libs/pjproject/pjlib/src/pj/pool_policy_kmalloc.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pj/pool.h>
#include <pj/except.h>
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pj/pool_policy_malloc.c b/sflphone-common/libs/pjproject/pjlib/src/pj/pool_policy_malloc.c
index e4cb542ad94b217b91921e0315b7e8d2cfd2be21..296a0e82161313466d1c8156123f9366948d4066 100644
--- a/sflphone-common/libs/pjproject/pjlib/src/pj/pool_policy_malloc.c
+++ b/sflphone-common/libs/pjproject/pjlib/src/pj/pool_policy_malloc.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pj/pool.h>
#include <pj/except.h>
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pj/pool_policy_new.cpp b/sflphone-common/libs/pjproject/pjlib/src/pj/pool_policy_new.cpp
index e22040a2f42be5a2f401f2a8a9b3dffd6c305919..ed4f2b4f44db36831e5a8badc938156894d9c3f3 100644
--- a/sflphone-common/libs/pjproject/pjlib/src/pj/pool_policy_new.cpp
+++ b/sflphone-common/libs/pjproject/pjlib/src/pj/pool_policy_new.cpp
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pj/pool.h>
#include <pj/except.h>
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pj/pool_signature.h b/sflphone-common/libs/pjproject/pjlib/src/pj/pool_signature.h
index 11e6a18f2ea99a136218c1c50601d62293c8c77c..381c81145e9dfae9a35ac7beb711b3a9526a0068 100644
--- a/sflphone-common/libs/pjproject/pjlib/src/pj/pool_signature.h
+++ b/sflphone-common/libs/pjproject/pjlib/src/pj/pool_signature.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pj/assert.h>
#include <pj/string.h>
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pj/rand.c b/sflphone-common/libs/pjproject/pjlib/src/pj/rand.c
index 62d94a087fde55836525316242e4a6215ce548f2..707b7aaa753ac157f25ef55a6c47996e40f4f3bd 100644
--- a/sflphone-common/libs/pjproject/pjlib/src/pj/rand.c
+++ b/sflphone-common/libs/pjproject/pjlib/src/pj/rand.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pj/rand.h>
#include <pj/os.h>
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pj/rbtree.c b/sflphone-common/libs/pjproject/pjlib/src/pj/rbtree.c
index 519ea00cb7d43a8ea63ae3afd50d149963a66706..8efeedeba311574fbb2635be6011d28369cfd9f5 100644
--- a/sflphone-common/libs/pjproject/pjlib/src/pj/rbtree.c
+++ b/sflphone-common/libs/pjproject/pjlib/src/pj/rbtree.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pj/rbtree.h>
#include <pj/os.h>
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pj/sock_bsd.c b/sflphone-common/libs/pjproject/pjlib/src/pj/sock_bsd.c
index f7d69a7f44fbaf5cce1943696af0fa57587e310f..ed8f07f5420216567b6a64ab3539a83648183220 100644
--- a/sflphone-common/libs/pjproject/pjlib/src/pj/sock_bsd.c
+++ b/sflphone-common/libs/pjproject/pjlib/src/pj/sock_bsd.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pj/sock.h>
#include <pj/os.h>
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pj/sock_common.c b/sflphone-common/libs/pjproject/pjlib/src/pj/sock_common.c
index f4442cfa161d72f6ec5cea0702645feaacb17b02..6f82d5c8e3fcd083dde1be3667a82611be367b9e 100644
--- a/sflphone-common/libs/pjproject/pjlib/src/pj/sock_common.c
+++ b/sflphone-common/libs/pjproject/pjlib/src/pj/sock_common.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pj/sock.h>
#include <pj/assert.h>
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pj/sock_linux_kernel.c b/sflphone-common/libs/pjproject/pjlib/src/pj/sock_linux_kernel.c
index 74c2a011a8da2d6af67b081b76a7b7a56028deab..f3b054ce8577a7cc34023270471e62d9a70bb570 100644
--- a/sflphone-common/libs/pjproject/pjlib/src/pj/sock_linux_kernel.c
+++ b/sflphone-common/libs/pjproject/pjlib/src/pj/sock_linux_kernel.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pj/sock.h>
#include <pj/assert.h>
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pj/sock_qos_bsd.c b/sflphone-common/libs/pjproject/pjlib/src/pj/sock_qos_bsd.c
index 59bfc9faf60d8643608f4aeab2796c23ca53edf4..df5434ea931ba69e45614b2de04c9c770b2d57ff 100644
--- a/sflphone-common/libs/pjproject/pjlib/src/pj/sock_qos_bsd.c
+++ b/sflphone-common/libs/pjproject/pjlib/src/pj/sock_qos_bsd.c
@@ -15,6 +15,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pj/sock_qos.h>
#include <pj/assert.h>
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pj/sock_qos_common.c b/sflphone-common/libs/pjproject/pjlib/src/pj/sock_qos_common.c
index 80711c541304050ddd6e4bdadf15bbf82b459fe8..7664435f96aa5205c8ce3dba41bf2fc8fa1dc3e4 100644
--- a/sflphone-common/libs/pjproject/pjlib/src/pj/sock_qos_common.c
+++ b/sflphone-common/libs/pjproject/pjlib/src/pj/sock_qos_common.c
@@ -15,6 +15,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pj/sock_qos.h>
#include <pj/assert.h>
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pj/sock_qos_dummy.c b/sflphone-common/libs/pjproject/pjlib/src/pj/sock_qos_dummy.c
index 200d53b9aed0dde87adfb305776ddf1a98cb690b..6299aed8346eaa5f3dc55f0a676da75483cf1caf 100644
--- a/sflphone-common/libs/pjproject/pjlib/src/pj/sock_qos_dummy.c
+++ b/sflphone-common/libs/pjproject/pjlib/src/pj/sock_qos_dummy.c
@@ -15,6 +15,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pj/sock_qos.h>
#include <pj/errno.h>
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pj/sock_qos_symbian.cpp b/sflphone-common/libs/pjproject/pjlib/src/pj/sock_qos_symbian.cpp
index 55a41097540a88ee0e5c173b84fe8bee061ab635..112fcc210407580424cf68d810281a7caee64bbf 100644
--- a/sflphone-common/libs/pjproject/pjlib/src/pj/sock_qos_symbian.cpp
+++ b/sflphone-common/libs/pjproject/pjlib/src/pj/sock_qos_symbian.cpp
@@ -15,6 +15,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pj/sock_qos.h>
#include "os_symbian.h"
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pj/sock_qos_wm.c b/sflphone-common/libs/pjproject/pjlib/src/pj/sock_qos_wm.c
index 895d74f342bb13fd0667e221d992847853c1afbf..393dfef8af983eb94d5bb063b34bb971e9065b84 100644
--- a/sflphone-common/libs/pjproject/pjlib/src/pj/sock_qos_wm.c
+++ b/sflphone-common/libs/pjproject/pjlib/src/pj/sock_qos_wm.c
@@ -15,6 +15,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pj/sock_qos.h>
#include <pj/assert.h>
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pj/sock_select.c b/sflphone-common/libs/pjproject/pjlib/src/pj/sock_select.c
index 628baccbb5c86c2229ce43f6fdb25f32787c99af..86393871bde92ec73ac4d1afccd75d6df2cd03ac 100644
--- a/sflphone-common/libs/pjproject/pjlib/src/pj/sock_select.c
+++ b/sflphone-common/libs/pjproject/pjlib/src/pj/sock_select.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pj/sock_select.h>
#include <pj/compat/socket.h>
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pj/sock_select_symbian.cpp b/sflphone-common/libs/pjproject/pjlib/src/pj/sock_select_symbian.cpp
index 727bcfdf8b3783a3e984f2804c642d3ab86a37cb..7d4cc8c9a8ef3fa78e19d654a0a87485c2103c43 100644
--- a/sflphone-common/libs/pjproject/pjlib/src/pj/sock_select_symbian.cpp
+++ b/sflphone-common/libs/pjproject/pjlib/src/pj/sock_select_symbian.cpp
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pj/sock_select.h>
#include <pj/array.h>
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pj/sock_symbian.cpp b/sflphone-common/libs/pjproject/pjlib/src/pj/sock_symbian.cpp
index b1c725c1493a28b5b227ce06ca0fa35ded9d36ff..7479ac745f485bc3e80aa9db54602ab336e8fb19 100644
--- a/sflphone-common/libs/pjproject/pjlib/src/pj/sock_symbian.cpp
+++ b/sflphone-common/libs/pjproject/pjlib/src/pj/sock_symbian.cpp
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pj/sock.h>
#include <pj/addr_resolv.h>
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pj/ssl_sock_common.c b/sflphone-common/libs/pjproject/pjlib/src/pj/ssl_sock_common.c
index 8a983fc6f82b028d8efdfff5803c22071d1b7293..39d21ac7707de6fe8bd05d2bcdce8ba51432dd60 100644
--- a/sflphone-common/libs/pjproject/pjlib/src/pj/ssl_sock_common.c
+++ b/sflphone-common/libs/pjproject/pjlib/src/pj/ssl_sock_common.c
@@ -15,6 +15,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pj/ssl_sock.h>
#include <pj/errno.h>
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pj/ssl_sock_ossl.c b/sflphone-common/libs/pjproject/pjlib/src/pj/ssl_sock_ossl.c
index d97305a20dc10640d112d05b0f127be57b0ff796..3f25e0ba98094d88900397750f9bbf836adcbf3e 100644
--- a/sflphone-common/libs/pjproject/pjlib/src/pj/ssl_sock_ossl.c
+++ b/sflphone-common/libs/pjproject/pjlib/src/pj/ssl_sock_ossl.c
@@ -15,6 +15,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pj/ssl_sock.h>
#include <pj/activesock.h>
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pj/ssl_sock_symbian.cpp b/sflphone-common/libs/pjproject/pjlib/src/pj/ssl_sock_symbian.cpp
index 684b2470cf5d39a9ba32c6f7ea8498c9e1781ab0..da388d0bc4f674681204100400f3b52a8de18817 100644
--- a/sflphone-common/libs/pjproject/pjlib/src/pj/ssl_sock_symbian.cpp
+++ b/sflphone-common/libs/pjproject/pjlib/src/pj/ssl_sock_symbian.cpp
@@ -15,6 +15,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pj/ssl_sock.h>
#include <pj/compat/socket.h>
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pj/string.c b/sflphone-common/libs/pjproject/pjlib/src/pj/string.c
index 5169eccc62bdcb29bfb288785bc97d11e6649458..8e92a930cd6eb38777b09b921109614356e2a84f 100644
--- a/sflphone-common/libs/pjproject/pjlib/src/pj/string.c
+++ b/sflphone-common/libs/pjproject/pjlib/src/pj/string.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pj/string.h>
#include <pj/assert.h>
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pj/symbols.c b/sflphone-common/libs/pjproject/pjlib/src/pj/symbols.c
index 02e96c772eb9fe6d4f9d26ea40cff64b59ed2c88..27ab4b7321b10a52d39e96a1f20b4edc39481e7c 100644
--- a/sflphone-common/libs/pjproject/pjlib/src/pj/symbols.c
+++ b/sflphone-common/libs/pjproject/pjlib/src/pj/symbols.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pjlib.h>
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pj/timer_symbian.cpp b/sflphone-common/libs/pjproject/pjlib/src/pj/timer_symbian.cpp
index 9b1127761f5bf6fa6fc62e48d2e2d49f01b0319e..6a243ecda2eac1147e9aad38443216c0135965b6 100644
--- a/sflphone-common/libs/pjproject/pjlib/src/pj/timer_symbian.cpp
+++ b/sflphone-common/libs/pjproject/pjlib/src/pj/timer_symbian.cpp
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pj/timer.h>
#include <pj/pool.h>
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pj/types.c b/sflphone-common/libs/pjproject/pjlib/src/pj/types.c
index 310946137f9e63c062642bba7e94e2088636edbd..d5734229b3a448e72a3ade35c6eb3d53ac5685f8 100644
--- a/sflphone-common/libs/pjproject/pjlib/src/pj/types.c
+++ b/sflphone-common/libs/pjproject/pjlib/src/pj/types.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pj/types.h>
#include <pj/os.h>
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pj/unicode_symbian.cpp b/sflphone-common/libs/pjproject/pjlib/src/pj/unicode_symbian.cpp
index b7404b4e9a74310bd20be0e00ae8fe098ee56f12..2665565c2fb2e79d6c46fcff6598c26675522b51 100644
--- a/sflphone-common/libs/pjproject/pjlib/src/pj/unicode_symbian.cpp
+++ b/sflphone-common/libs/pjproject/pjlib/src/pj/unicode_symbian.cpp
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pj/unicode.h>
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pj/unicode_win32.c b/sflphone-common/libs/pjproject/pjlib/src/pj/unicode_win32.c
index 47fa8c83fee0f84508bc5b7ae7f8d1465f4f2fa3..20842d6786ff843260ea6a18372166ebfd4684fb 100644
--- a/sflphone-common/libs/pjproject/pjlib/src/pj/unicode_win32.c
+++ b/sflphone-common/libs/pjproject/pjlib/src/pj/unicode_win32.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pj/unicode.h>
#include <pj/assert.h>
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pjlib++-test/main.cpp b/sflphone-common/libs/pjproject/pjlib/src/pjlib++-test/main.cpp
index 6b749ad62dfba137f30cd89cc30c0d60113ab5e4..d0e204c63b40b0eb9af9cad278ae8f2f86d004cb 100644
--- a/sflphone-common/libs/pjproject/pjlib/src/pjlib++-test/main.cpp
+++ b/sflphone-common/libs/pjproject/pjlib/src/pjlib++-test/main.cpp
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pj++/file.hpp>
#include <pj++/list.hpp>
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pjlib-samples/except.c b/sflphone-common/libs/pjproject/pjlib/src/pjlib-samples/except.c
index 7e2926616ea60c05348e092ef73e346b922c96d2..e87f8ddc02395237a7538f3e5c523a1f090c1e8b 100644
--- a/sflphone-common/libs/pjproject/pjlib/src/pjlib-samples/except.c
+++ b/sflphone-common/libs/pjproject/pjlib/src/pjlib-samples/except.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pj/except.h>
#include <pj/rand.h>
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pjlib-samples/list.c b/sflphone-common/libs/pjproject/pjlib/src/pjlib-samples/list.c
index c573213608d102c95cbd4a4974794c52a13eac90..7edfd0c8e699f3b5dfa7d609398ca88747bfaa33 100644
--- a/sflphone-common/libs/pjproject/pjlib/src/pjlib-samples/list.c
+++ b/sflphone-common/libs/pjproject/pjlib/src/pjlib-samples/list.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pj/list.h>
#include <pj/assert.h>
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pjlib-samples/log.c b/sflphone-common/libs/pjproject/pjlib/src/pjlib-samples/log.c
index 8ad149985ec3e6f7fec9447efefaea0a7b743ddd..e09e8fbc6012fb44a4cbe8960c807643dff14454 100644
--- a/sflphone-common/libs/pjproject/pjlib/src/pjlib-samples/log.c
+++ b/sflphone-common/libs/pjproject/pjlib/src/pjlib-samples/log.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pj/log.h>
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/activesock.c b/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/activesock.c
index 42c5900666bb347e63efd2e196e394d346b9e9f0..87c27195ed54004ff34a62afe79c0192ec76c873 100644
--- a/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/activesock.c
+++ b/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/activesock.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include "test.h"
#include <pjlib.h>
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/atomic.c b/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/atomic.c
index 3fad0bed7c4c774340ea83643307165a4401ef74..051988009407f032206dba799b767634b5de729d 100644
--- a/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/atomic.c
+++ b/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/atomic.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include "test.h"
#include <pjlib.h>
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/echo_clt.c b/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/echo_clt.c
index 84bf686d7847093fc7b888ced537cc5a94eb8f33..4ad72c1595101c36d3b2b40d2ce2290a22087e82 100644
--- a/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/echo_clt.c
+++ b/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/echo_clt.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include "test.h"
#include <pjlib.h>
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/errno.c b/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/errno.c
index b6445f2952ef84408f51fb24ce2edd7a7bd3f7a2..f0ab546c40f0dd208fcb98d7ec85b318a4fd77c5 100644
--- a/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/errno.c
+++ b/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/errno.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include "test.h"
#include <pj/errno.h>
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/exception.c b/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/exception.c
index 6ffa249822e3b73abd7d33d16f7917eae5a49f55..cb973eeff905964cf447a2fbf55ccc5044c88f44 100644
--- a/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/exception.c
+++ b/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/exception.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include "test.h"
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/exception_wrap.cpp b/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/exception_wrap.cpp
index ecc542e79b7a882260bead57d95e5aba1fa0802e..8562c0ed950636e72869e9bb15b3e6da020f007b 100644
--- a/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/exception_wrap.cpp
+++ b/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/exception_wrap.cpp
@@ -15,6 +15,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
/*
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/fifobuf.c b/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/fifobuf.c
index ce5978ed5165398a826e5b5ddb16e6e71b93c07d..c1043fba3f9d8e53e923f8f45cce4e7da286f89b 100644
--- a/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/fifobuf.c
+++ b/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/fifobuf.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include "test.h"
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/file.c b/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/file.c
index 9ec6f37b023e9b8b1b44ed1faa3c0ba39110586c..d7aa398413f180a298f80003a6ad77eca0b952f8 100644
--- a/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/file.c
+++ b/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/file.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include "test.h"
#include <pjlib.h>
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/hash_test.c b/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/hash_test.c
index 73aca4007fa2dc08a5d047425187219490fc5def..d84cd9bf7986261176688f2ffcc31b3a70d89217 100644
--- a/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/hash_test.c
+++ b/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/hash_test.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pj/hash.h>
#include <pj/rand.h>
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/ioq_perf.c b/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/ioq_perf.c
index bbbce560ac70fdcd1ef4982f22b13e9f35776ade..576d0fe3605e5d9a9da86eeabae7d10279a001b6 100644
--- a/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/ioq_perf.c
+++ b/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/ioq_perf.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include "test.h"
#include <pjlib.h>
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/ioq_tcp.c b/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/ioq_tcp.c
index a699f54bdf18c405bcdc2745cbdf078f10436db0..38d28eb1ba266e72a850d7ec1f80427d21dbb9f2 100644
--- a/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/ioq_tcp.c
+++ b/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/ioq_tcp.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include "test.h"
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/ioq_udp.c b/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/ioq_udp.c
index e9139bcf63e0aad562284b38e2e6337bcd219f85..bca2c19e44cb4e15060a1f9634425dab75ccbee9 100644
--- a/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/ioq_udp.c
+++ b/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/ioq_udp.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include "test.h"
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/ioq_unreg.c b/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/ioq_unreg.c
index f3ea9130c288e1e32fd0e0a9327d2f9b2379ff9b..a0633007d881b6d9b5b1d974dd4025d8d2e32460 100644
--- a/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/ioq_unreg.c
+++ b/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/ioq_unreg.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include "test.h"
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/list.c b/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/list.c
index e5509d55b3f1c2c253c521fc190958a037dffa26..a5ed381ae7a377b2b10b27e4312ca94649316720 100644
--- a/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/list.c
+++ b/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/list.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include "test.h"
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/main.c b/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/main.c
index d7adce484af17a9c523b2ed6591a14dc0656e8ae..c730ca6e772e6cce143f8534677d90a2e396d467 100644
--- a/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/main.c
+++ b/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/main.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include "test.h"
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/main_mod.c b/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/main_mod.c
index 81a87dc96f5010ac1589494f048a79c9fe86e02a..fc7259fced729fa65a034a791f42ca0c13206c9a 100644
--- a/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/main_mod.c
+++ b/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/main_mod.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include "test.h"
#include <linux/module.h>
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/main_rtems.c b/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/main_rtems.c
index 828a38d8c9c1e834c9b899f1d36ad47169c21d24..19a8c2e7159c4acc27f98fc11275ee054942d0ee 100644
--- a/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/main_rtems.c
+++ b/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/main_rtems.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
/*
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/main_win32.c b/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/main_win32.c
index a1bb77d1f0e3626e458e48c2e242d04f3c82f902..345ce359c454b9691710a6073c3e7d0f1a93f084 100644
--- a/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/main_win32.c
+++ b/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/main_win32.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include "test.h"
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/mutex.c b/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/mutex.c
index 80fce7c3084550836db9910e9f18a12fbaebbab2..2d893d8903537cc3cefe1de720d4180095eb2a16 100644
--- a/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/mutex.c
+++ b/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/mutex.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include "test.h"
#include <pjlib.h>
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/os.c b/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/os.c
index f19a6bfa6dc84dc60c8497ce9ed75e560a98ee2c..37366d7c94917765161631fbe1bf4b496fa6f286 100644
--- a/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/os.c
+++ b/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/os.c
@@ -16,5 +16,16 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
int dummy_os_var;
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/pool.c b/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/pool.c
index 417aa3bb4ad8e08741b9b551906af2a9edd18bb2..268d22d5b0dac1f918bc3edcdc0aa35cea1df20d 100644
--- a/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/pool.c
+++ b/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/pool.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pj/pool.h>
#include <pj/pool_buf.h>
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/pool_perf.c b/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/pool_perf.c
index fe9967fe7ccd06ba2c16e96c933f63908a889c5f..6669c178d99cb2695b1cfb200cd0b4ffbe1d2d50 100644
--- a/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/pool_perf.c
+++ b/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/pool_perf.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include "test.h"
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/pool_wrap.cpp b/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/pool_wrap.cpp
index 381e42aee345d4da3a9025e6f150e30df638c6dc..0158e3bf0aac91599527933514fbef46953aae07 100644
--- a/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/pool_wrap.cpp
+++ b/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/pool_wrap.cpp
@@ -15,6 +15,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
/*
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/rand.c b/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/rand.c
index 404a41be0282691df601a1ea9a74e153ae3f4e5a..b8a3b0272b66f381cf040b06d66df787f0f7d913 100644
--- a/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/rand.c
+++ b/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/rand.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pj/rand.h>
#include <pj/log.h>
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/rbtree.c b/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/rbtree.c
index 14ddd3b06501a68de83f66f08b72e3f1302fef24..1ef8e39d98bbadbd69e0a6a1695aa1136a29196c 100644
--- a/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/rbtree.c
+++ b/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/rbtree.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include "test.h"
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/rtems_network_config.h b/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/rtems_network_config.h
index ef08f3d32eab77a631613e8938575a514e096198..6da26187ea671394a6b46f8bb0bb4c960ab7a887 100644
--- a/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/rtems_network_config.h
+++ b/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/rtems_network_config.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
/*
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/select.c b/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/select.c
index eec7574b426adf91e544b21a0d59eeaef251f6bb..5b6671acfd2979508a54939dde25db6156bc580b 100644
--- a/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/select.c
+++ b/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/select.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include "test.h"
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/sleep.c b/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/sleep.c
index 8c2009431e301f182d52f67ec09ecfc5ec7a9ebd..a56d09a63223b224227108e859905057944dde6f 100644
--- a/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/sleep.c
+++ b/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/sleep.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include "test.h"
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/sock.c b/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/sock.c
index ac5cc3333e7fada77f56db55e45143ab0a25ab4b..f54178b9850fc7da14f2a85084afeb86d5899e4f 100644
--- a/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/sock.c
+++ b/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/sock.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pjlib.h>
#include "test.h"
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/sock_perf.c b/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/sock_perf.c
index 51928ddf75f0826ea454d92d11d6b94a5d5c4900..1e9a9b4eb0c4851cb0a0ea236c3976edbe2c88e0 100644
--- a/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/sock_perf.c
+++ b/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/sock_perf.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include "test.h"
#include <pjlib.h>
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/ssl_sock.c b/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/ssl_sock.c
index 691e48bfebe357e9fa5b4a892b2658fcd797f243..36cd819cf78e838f2c6caea3133aa149ff943573 100644
--- a/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/ssl_sock.c
+++ b/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/ssl_sock.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include "test.h"
#include <pjlib.h>
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/string.c b/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/string.c
index a202354cbd6eb82e1084495c1297fd828e307d2f..ca7777ca99c386b86255b6ff4d5eab4c249a9c6e 100644
--- a/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/string.c
+++ b/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/string.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pj/string.h>
#include <pj/pool.h>
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/test.c b/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/test.c
index 5db7346d910cbc0c2989ccff828140ab673f2f9f..dba5a80274363194a4bf5e3fdf0bbc73a41f7bbe 100644
--- a/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/test.c
+++ b/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/test.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include "test.h"
#include <pjlib.h>
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/test.h b/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/test.h
index a35da79d3011db65c786098efbaa817408f5e085..2f4c483d72825e3db2a67dd18af80025910aa4a3 100644
--- a/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/test.h
+++ b/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/test.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJLIB_TEST_H__
#define __PJLIB_TEST_H__
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/test_wrap.cpp b/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/test_wrap.cpp
index 788bd153b4ed6e8bcaee0e7bc5dd2c456319a3c5..2572e91d126220196b75e4a6565552d0a65b4d05 100644
--- a/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/test_wrap.cpp
+++ b/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/test_wrap.cpp
@@ -15,6 +15,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
/*
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/thread.c b/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/thread.c
index 126b1ef5aa4862b12fbd2d72e72becc66da40b60..2cc59098f3e1e8cc3925bacc0c3b2526531414c0 100644
--- a/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/thread.c
+++ b/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/thread.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include "test.h"
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/timer.c b/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/timer.c
index 0c0d5fc9e01e23c7ea4fad782fcb846b97f73a3c..ede138d29304b4f931dadb9c4ba8057bc47cfd13 100644
--- a/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/timer.c
+++ b/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/timer.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include "test.h"
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/timestamp.c b/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/timestamp.c
index 3f04448f7993fa6030d29a3f55b9ee320676d8c6..b7ac7f030c7f1393cc3a35ab47cd927e2e2b312e 100644
--- a/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/timestamp.c
+++ b/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/timestamp.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include "test.h"
#include <pj/os.h>
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/udp_echo_srv_ioqueue.c b/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/udp_echo_srv_ioqueue.c
index 8646985413bf754b69211e28308adc516b3d07a9..1428e1b282c4663e6363e7c09537e7b2888ea42d 100644
--- a/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/udp_echo_srv_ioqueue.c
+++ b/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/udp_echo_srv_ioqueue.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pjlib.h>
#include "test.h"
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/udp_echo_srv_sync.c b/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/udp_echo_srv_sync.c
index 29f8d90ea40bd7a73592daf0932ae8fd374024a9..ceff924389d7fa0e96f2397c46fbf07162bc6420 100644
--- a/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/udp_echo_srv_sync.c
+++ b/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/udp_echo_srv_sync.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include "test.h"
#include <pjlib.h>
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/util.c b/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/util.c
index 97f51b206990e0b4404aaaa04c9ab43d7a42aa48..3096aa6531c77f17b8a543d1e49a916036eff0a0 100644
--- a/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/util.c
+++ b/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/util.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include "test.h"
#include <pjlib.h>
diff --git a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia-audiodev/audiodev.h b/sflphone-common/libs/pjproject/pjmedia/include/pjmedia-audiodev/audiodev.h
index a10ebb9e221a45295f55c98bf76040efb7f43976..950da4298b5e10bf478162d7b1129ef4066959e9 100644
--- a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia-audiodev/audiodev.h
+++ b/sflphone-common/libs/pjproject/pjmedia/include/pjmedia-audiodev/audiodev.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJMEDIA_AUDIODEV_AUDIODEV_H__
#define __PJMEDIA_AUDIODEV_AUDIODEV_H__
diff --git a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia-audiodev/audiodev_imp.h b/sflphone-common/libs/pjproject/pjmedia/include/pjmedia-audiodev/audiodev_imp.h
index 0471afd886e9e7171b5dc45f6346a8052990ba0a..c4b78335f341e85cd0b4c20e309fcc79c703a28e 100644
--- a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia-audiodev/audiodev_imp.h
+++ b/sflphone-common/libs/pjproject/pjmedia/include/pjmedia-audiodev/audiodev_imp.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __AUDIODEV_IMP_H__
#define __AUDIODEV_IMP_H__
diff --git a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia-audiodev/audiotest.h b/sflphone-common/libs/pjproject/pjmedia/include/pjmedia-audiodev/audiotest.h
index 35e115c37ecede45ed819de5824885d897e789a2..97e887ab5256cca5c49acb4ac1321667fe3e8f00 100644
--- a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia-audiodev/audiotest.h
+++ b/sflphone-common/libs/pjproject/pjmedia/include/pjmedia-audiodev/audiotest.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJMEDIA_AUDIODEV_AUDIOTEST_H__
#define __PJMEDIA_AUDIODEV_AUDIOTEST_H__
diff --git a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia-audiodev/config.h b/sflphone-common/libs/pjproject/pjmedia/include/pjmedia-audiodev/config.h
index 2ab01f2718c457e9a0f955d670aa53d2ea2201d6..276e4cd7b04be42f127efa58f73d81b1dc723367 100644
--- a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia-audiodev/config.h
+++ b/sflphone-common/libs/pjproject/pjmedia/include/pjmedia-audiodev/config.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJMEDIA_AUDIODEV_CONFIG_H__
#define __PJMEDIA_AUDIODEV_CONFIG_H__
diff --git a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia-audiodev/errno.h b/sflphone-common/libs/pjproject/pjmedia/include/pjmedia-audiodev/errno.h
index 694f91673d42244f911dca04356618f19eb8e8c7..db9ea8616cc947401f613b5b1bef463cd2bc8aed 100644
--- a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia-audiodev/errno.h
+++ b/sflphone-common/libs/pjproject/pjmedia/include/pjmedia-audiodev/errno.h
@@ -15,6 +15,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJMEDIA_AUDIODEV_AUDIODEV_ERRNO_H__
#define __PJMEDIA_AUDIODEV_AUDIODEV_ERRNO_H__
diff --git a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia-codec.h b/sflphone-common/libs/pjproject/pjmedia/include/pjmedia-codec.h
index 73fc34d148f623dd7e24ca5b1aa1d2f0c360e559..25d1b931c6b91b0123fd205fcac794aea496bf26 100644
--- a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia-codec.h
+++ b/sflphone-common/libs/pjproject/pjmedia/include/pjmedia-codec.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJMEDIA_CODEC_PJMEDIA_CODEC_H__
#define __PJMEDIA_CODEC_PJMEDIA_CODEC_H__
diff --git a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia-codec/amr_helper.h b/sflphone-common/libs/pjproject/pjmedia/include/pjmedia-codec/amr_helper.h
index 217de0b10879cf21fc6ff4914b9819c3800293fe..786d6b7e0831fa254c95e6d110954b34cebbfc52 100644
--- a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia-codec/amr_helper.h
+++ b/sflphone-common/libs/pjproject/pjmedia/include/pjmedia-codec/amr_helper.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJMEDIA_CODECS_AMR_HELPER_H__
diff --git a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia-codec/config.h b/sflphone-common/libs/pjproject/pjmedia/include/pjmedia-codec/config.h
index 627f58882322304fdccdb033f8a75f89b83d17aa..d8de2fed07f3efaa6bbb2c58dee23133ebffbffa 100644
--- a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia-codec/config.h
+++ b/sflphone-common/libs/pjproject/pjmedia/include/pjmedia-codec/config.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJMEDIA_CODEC_CONFIG_H__
#define __PJMEDIA_CODEC_CONFIG_H__
diff --git a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia-codec/config_auto.h.in b/sflphone-common/libs/pjproject/pjmedia/include/pjmedia-codec/config_auto.h.in
index 03cbc2c8faba2310cc3a716e061b5774ec45d0d7..1cec88bea3f816ac9065666ff7b9ee7077c5c368 100644
--- a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia-codec/config_auto.h.in
+++ b/sflphone-common/libs/pjproject/pjmedia/include/pjmedia-codec/config_auto.h.in
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJMEDIA_CODEC_CONFIG_AUTO_H_
#define __PJMEDIA_CODEC_CONFIG_AUTO_H_
diff --git a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia-codec/g722.h b/sflphone-common/libs/pjproject/pjmedia/include/pjmedia-codec/g722.h
index 2596c561b8d3f1ec9d2ca29b64031487f12e10fb..f74ca1c8a65965eeb538c9f7f40bba10eb3b42bb 100644
--- a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia-codec/g722.h
+++ b/sflphone-common/libs/pjproject/pjmedia/include/pjmedia-codec/g722.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJMEDIA_CODEC_G722_H__
#define __PJMEDIA_CODEC_G722_H__
diff --git a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia-codec/g7221.h b/sflphone-common/libs/pjproject/pjmedia/include/pjmedia-codec/g7221.h
index d7e19ff31b8f4b0a8864962aa2af795ad3525716..02ea74ceb4b8809b6ff82f88729439203a5b0781 100644
--- a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia-codec/g7221.h
+++ b/sflphone-common/libs/pjproject/pjmedia/include/pjmedia-codec/g7221.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJMEDIA_CODECS_G7221_H__
#define __PJMEDIA_CODECS_G7221_H__
diff --git a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia-codec/gsm.h b/sflphone-common/libs/pjproject/pjmedia/include/pjmedia-codec/gsm.h
index 98221bda96e74742ef1378b966b12cc700e36c23..54d85d49f539ea4d5d824178d8259d3ef37b493e 100644
--- a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia-codec/gsm.h
+++ b/sflphone-common/libs/pjproject/pjmedia/include/pjmedia-codec/gsm.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJMEDIA_CODEC_GSM_H__
#define __PJMEDIA_CODEC_GSM_H__
diff --git a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia-codec/ilbc.h b/sflphone-common/libs/pjproject/pjmedia/include/pjmedia-codec/ilbc.h
index aca914da5f3b3c281bdb00709951e6c4eb0c3813..54578db86996773b2c24f1d6c0b80a87156605a7 100644
--- a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia-codec/ilbc.h
+++ b/sflphone-common/libs/pjproject/pjmedia/include/pjmedia-codec/ilbc.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJMEDIA_CODEC_ILBC_H__
#define __PJMEDIA_CODEC_ILBC_H__
diff --git a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia-codec/ipp_codecs.h b/sflphone-common/libs/pjproject/pjmedia/include/pjmedia-codec/ipp_codecs.h
index d5cf977955d555340df67f404c46327d2026a1db..994755eedfbf821a56d3921bb17eca9e9173ddf0 100644
--- a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia-codec/ipp_codecs.h
+++ b/sflphone-common/libs/pjproject/pjmedia/include/pjmedia-codec/ipp_codecs.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJMEDIA_CODECS_IPP_H__
#define __PJMEDIA_CODECS_IPP_H__
diff --git a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia-codec/l16.h b/sflphone-common/libs/pjproject/pjmedia/include/pjmedia-codec/l16.h
index 0f9b378789ba76643bc21e4584b9c296a6f631c6..5674d91ade4b3b03f1199bba3a10e9dc74ded910 100644
--- a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia-codec/l16.h
+++ b/sflphone-common/libs/pjproject/pjmedia/include/pjmedia-codec/l16.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJMEDIA_CODEC_L16_H__
#define __PJMEDIA_CODEC_L16_H__
diff --git a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia-codec/passthrough.h b/sflphone-common/libs/pjproject/pjmedia/include/pjmedia-codec/passthrough.h
index d7a535d23c98c32c096b91daa1e3b72f0de4a82d..35ba03e329b2f5e32f71e62005c839f3c7f51a4a 100644
--- a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia-codec/passthrough.h
+++ b/sflphone-common/libs/pjproject/pjmedia/include/pjmedia-codec/passthrough.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJMEDIA_CODECS_PASSTHROUGH_H__
#define __PJMEDIA_CODECS_PASSTHROUGH_H__
diff --git a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia-codec/speex.h b/sflphone-common/libs/pjproject/pjmedia/include/pjmedia-codec/speex.h
index e6491ffd584033d4caa5b4ca3f3df4d797b4b3e1..232af1f02e65b5daac87a8c91ff721934edd80a6 100644
--- a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia-codec/speex.h
+++ b/sflphone-common/libs/pjproject/pjmedia/include/pjmedia-codec/speex.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJMEDIA_CODEC_SPEEX_H__
#define __PJMEDIA_CODEC_SPEEX_H__
diff --git a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia-codec/types.h b/sflphone-common/libs/pjproject/pjmedia/include/pjmedia-codec/types.h
index c355bbadeb0ecfeb149a4260dc11586263828a38..5020f82ad85cd2567d981c6e66897208341afc50 100644
--- a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia-codec/types.h
+++ b/sflphone-common/libs/pjproject/pjmedia/include/pjmedia-codec/types.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJMEDIA_CODEC_TYPES_H__
#define __PJMEDIA_CODEC_TYPES_H__
diff --git a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia.h b/sflphone-common/libs/pjproject/pjmedia/include/pjmedia.h
index c87563582f501f72c87d2daef0f0a2906f907567..eeabf3614b322ba8968e7b972a1bcc334fa4913e 100644
--- a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia.h
+++ b/sflphone-common/libs/pjproject/pjmedia/include/pjmedia.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJMEDIA_H__
#define __PJMEDIA_H__
diff --git a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/alaw_ulaw.h b/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/alaw_ulaw.h
index 89592957c5562af32f070d3a31e9d55935681d4b..4fe115a982dbfadc72c59f75daf7d81c772424fd 100644
--- a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/alaw_ulaw.h
+++ b/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/alaw_ulaw.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJMEDIA_ALAW_ULAW_H__
#define __PJMEDIA_ALAW_ULAW_H__
diff --git a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/bidirectional.h b/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/bidirectional.h
index e43db513a727b15a1f0c1c6efe1e325e222337cf..cec8a2911b01fde6835dfa533b577e570f376380 100644
--- a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/bidirectional.h
+++ b/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/bidirectional.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJMEDIA_BIDIRECTIONAL_H__
#define __PJMEDIA_BIDIRECTIONAL_H__
diff --git a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/circbuf.h b/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/circbuf.h
index 0e7d83b2a94574e91f61386237a3d296768e440f..17ded4d714b52af67280297876b249d15df59d3e 100644
--- a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/circbuf.h
+++ b/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/circbuf.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJMEDIA_CIRC_BUF_H__
diff --git a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/clock.h b/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/clock.h
index c9c9b54f19bb184214c0680f89020f9897a02345..61d1a10f430de43a679383a2e5f9a723a674e595 100644
--- a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/clock.h
+++ b/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/clock.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJMEDIA_CLOCK_H__
#define __PJMEDIA_CLOCK_H__
diff --git a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/codec.h b/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/codec.h
index da91069bb5d953f5bb9ab4a8cbd5c597a39dbed9..12a9b5434b051ebfefaa3d53b19cb48aefc92f60 100644
--- a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/codec.h
+++ b/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/codec.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJMEDIA_CODEC_H__
#define __PJMEDIA_CODEC_H__
diff --git a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/conference.h b/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/conference.h
index 7f19e4b19861036875506f1bb9c666d9c99a11fb..487d64f6e048dedfee2b9a9cef450875fcfd749a 100644
--- a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/conference.h
+++ b/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/conference.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJMEDIA_CONF_H__
#define __PJMEDIA_CONF_H__
diff --git a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/config.h b/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/config.h
index d1c6e0364c80ba08f2c6eeaceb24345cdcd88167..a929b867cb2d2c63bfa8500615dcfc09d48a1c17 100644
--- a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/config.h
+++ b/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/config.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJMEDIA_CONFIG_H__
#define __PJMEDIA_CONFIG_H__
diff --git a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/config_auto.h.in b/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/config_auto.h.in
index ea76f50f593830c8f6d6f5023f423b070802592f..e082e243633f7a244d70760360b41394d4ac43ed 100644
--- a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/config_auto.h.in
+++ b/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/config_auto.h.in
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJMEDIA_CONFIG_AUTO_H_
#define __PJMEDIA_CONFIG_AUTO_H_
diff --git a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/delaybuf.h b/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/delaybuf.h
index 1fe4abadaefb46b1a392a9455cb66e71cb7ee490..6279cb84088b2421d9b57220b3583ba214a2dfc0 100644
--- a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/delaybuf.h
+++ b/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/delaybuf.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJMEDIA_DELAYBUF_H__
diff --git a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/doxygen.h b/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/doxygen.h
index 66704aab6bacff6e51ea7a4aeafaf4ac6188eaf2..1005278618fbc1c26f6ae0c435e6d61c64167938 100644
--- a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/doxygen.h
+++ b/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/doxygen.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJMEDIA_DOXYGEN_H__
#define __PJMEDIA_DOXYGEN_H__
diff --git a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/echo.h b/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/echo.h
index ce98371f7e1e1187917eae7b0a0165aa63b89644..4dadf621fc61a1869d5d81fa5c9444cdf58f0b82 100644
--- a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/echo.h
+++ b/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/echo.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJMEDIA_ECHO_H__
#define __PJMEDIA_ECHO_H__
diff --git a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/echo_port.h b/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/echo_port.h
index dc524cd21ed117811e1ef63ec6770f9a815d2613..241c5b137cdf8b70a9d6ee992646861cb35b3680 100644
--- a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/echo_port.h
+++ b/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/echo_port.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJMEDIA_AEC_PORT_H__
#define __PJMEDIA_AEC_PORT_H__
diff --git a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/endpoint.h b/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/endpoint.h
index c574dc4da7aa854fc12a65a8bb69b95b32337487..b2c75b6c1687b456d814e5af4a806431fc87b213 100644
--- a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/endpoint.h
+++ b/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/endpoint.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJMEDIA_MEDIAMGR_H__
#define __PJMEDIA_MEDIAMGR_H__
diff --git a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/errno.h b/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/errno.h
index b1fd018495b520b3c657330fa9753f7ff101a883..e660c19b8505a6e1f373c6c8275ad887a8bb8be5 100644
--- a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/errno.h
+++ b/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/errno.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJMEDIA_ERRNO_H__
#define __PJMEDIA_ERRNO_H__
diff --git a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/g711.h b/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/g711.h
index 20e471d36119f9db38d7aad7d81a1d38e7ba9ba4..f988269fd4bd20fc342b34ff6d736004cf6578c2 100644
--- a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/g711.h
+++ b/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/g711.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJMEDIA_G711_H__
#define __PJMEDIA_G711_H__
diff --git a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/jbuf.h b/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/jbuf.h
index fbf09db8a7b28da9c90855dd1bbfc692c24739cb..a7a1a310e50dee265c5b5bebeb132595f7ac1ae3 100644
--- a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/jbuf.h
+++ b/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/jbuf.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
/*
* Based on implementation kindly contributed by Switchlab, Ltd.
diff --git a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/master_port.h b/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/master_port.h
index ddd63ba750e9057be15d9e28cb8686ca295c3db0..4bf67c22e9ec39a5e998e7f01f4bd704153176ca 100644
--- a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/master_port.h
+++ b/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/master_port.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJMEDIA_MASTER_PORT_H__
#define __PJMEDIA_MASTER_PORT_H__
diff --git a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/mem_port.h b/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/mem_port.h
index 9bae66835b319befff4f93eae7f5e87133380920..4da33c20a6c637dd9708e9348c22b2d821087376 100644
--- a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/mem_port.h
+++ b/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/mem_port.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJMEDIA_MEM_PORT_H__
#define __PJMEDIA_MEM_PORT_H__
diff --git a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/null_port.h b/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/null_port.h
index 361b0e8835c6a87f22f5fdb6ff312cf912a75010..ae69e9320e6966f9cfc805eeb138475218c5d227 100644
--- a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/null_port.h
+++ b/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/null_port.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJMEDIA_NULL_PORT_H__
#define __PJMEDIA_NULL_PORT_H__
diff --git a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/plc.h b/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/plc.h
index 18723b8fc01294f6b0af09c1907158991c3b7279..3fc20c7d5aa3590f718bc30dc24efe93d7889065 100644
--- a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/plc.h
+++ b/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/plc.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJMEDIA_PLC_H__
#define __PJMEDIA_PLC_H__
diff --git a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/port.h b/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/port.h
index 5af070db715a2ed3f665056f85b74163c2ad8c2d..aba675daac576b1bbcb48f2404cd27bb1c25df35 100644
--- a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/port.h
+++ b/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/port.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJMEDIA_PORT_H__
#define __PJMEDIA_PORT_H__
diff --git a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/resample.h b/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/resample.h
index 17b9bc6283fc5650431caadc486b32a9bc11b42e..c70705f7ee1a113483d3ab95dbdca779b420119f 100644
--- a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/resample.h
+++ b/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/resample.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJMEDIA_RESAMPLE_H__
#define __PJMEDIA_RESAMPLE_H__
diff --git a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/rtcp.h b/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/rtcp.h
index 7a81d07d3028c102aa2b204e04d8275f6cc6bb78..60dcd7f217e64519703abe6c6072cbb70f863595 100644
--- a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/rtcp.h
+++ b/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/rtcp.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJMEDIA_RTCP_H__
#define __PJMEDIA_RTCP_H__
diff --git a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/rtcp_xr.h b/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/rtcp_xr.h
index acd5c4c0c2f8393294a5410123cee74aca6312bc..b5f2c60209ff1c615974e98241f3bd50c7ceedee 100644
--- a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/rtcp_xr.h
+++ b/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/rtcp_xr.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJMEDIA_RTCP_XR_H__
#define __PJMEDIA_RTCP_XR_H__
diff --git a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/rtp.h b/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/rtp.h
index 20d51c0c5769977838dd85578ca69edb5057342e..dd9cc5f4caa323bef6bb98524f7ac5fe5b90f60a 100644
--- a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/rtp.h
+++ b/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/rtp.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJMEDIA_RTP_H__
#define __PJMEDIA_RTP_H__
diff --git a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/sdp.h b/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/sdp.h
index eaa40c885176154a20794856844221674e5d6ba8..33233e6c4094b8e0cd774722e47e6bc3825b41c4 100644
--- a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/sdp.h
+++ b/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/sdp.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJMEDIA_SDP_H__
#define __PJMEDIA_SDP_H__
diff --git a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/sdp_neg.h b/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/sdp_neg.h
index f3796154641cecb6eb48f8af6f8dac73d513c9eb..f6002c00265f6be100be514579b4a225b9fc5604 100644
--- a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/sdp_neg.h
+++ b/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/sdp_neg.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJMEDIA_SDP_NEG_H__
#define __PJMEDIA_SDP_NEG_H__
diff --git a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/session.h b/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/session.h
index e5d8c31f787279484346c76091d8cb7d4cec8972..ed8eb6162caae4f0b15727a85579e1870d87479a 100644
--- a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/session.h
+++ b/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/session.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJMEDIA_SESSION_H__
#define __PJMEDIA_SESSION_H__
diff --git a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/silencedet.h b/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/silencedet.h
index f424638947fa2de5bee5d81db571002b434a2601..dfa11d6b18924e7459998ead1b073909a3897791 100644
--- a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/silencedet.h
+++ b/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/silencedet.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJMEDIA_SILENCE_DET_H__
#define __PJMEDIA_SILENCE_DET_H__
diff --git a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/sound.h b/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/sound.h
index 9827455839027313b4a01457cc866a99735e878e..babbab971c4a5c1a64027fc4157db46ff7517a5c 100644
--- a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/sound.h
+++ b/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/sound.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJMEDIA_SOUND_H__
#define __PJMEDIA_SOUND_H__
diff --git a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/sound_port.h b/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/sound_port.h
index 7439a28a3e2a1bdcd4d19600e7df5367e3ee02b5..07fc90ac47c670c36844d7c2d9a3e5bd3242418d 100644
--- a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/sound_port.h
+++ b/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/sound_port.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJMEDIA_SOUND_PORT_H__
#define __PJMEDIA_SOUND_PORT_H__
diff --git a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/splitcomb.h b/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/splitcomb.h
index f1b1ccfc91a08e81f81acb493bffbe0a65f4024e..8418e250f85be975b6bd624646dfb83745f20655 100644
--- a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/splitcomb.h
+++ b/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/splitcomb.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJMEDIA_SPLITCOMB_H__
#define __PJMEDIA_SPLITCOMB_H__
diff --git a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/stereo.h b/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/stereo.h
index 405384b40a660b9c493434cfd1a42a6a56b99611..1b00b99c3bc76624f8a36b22a395dbf529576460 100644
--- a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/stereo.h
+++ b/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/stereo.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJMEDIA_STEREO_H__
#define __PJMEDIA_STEREO_H__
diff --git a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/stream.h b/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/stream.h
index 93fdce14ed57554c7ac10d130d15f6d530679cc0..4532fac609f22696764065d7f993562fc35cfc6e 100644
--- a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/stream.h
+++ b/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/stream.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJMEDIA_STREAM_H__
#define __PJMEDIA_STREAM_H__
diff --git a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/symbian_sound_aps.h b/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/symbian_sound_aps.h
index 53242d99640f8cabbd777dd10f6401477b0458ed..a1f31bf26bf1f0ef4eda543d7cd2ff39893b1be4 100644
--- a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/symbian_sound_aps.h
+++ b/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/symbian_sound_aps.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJMEDIA_SYMBIAN_SOUND_APS_H__
#define __PJMEDIA_SYMBIAN_SOUND_APS_H__
diff --git a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/tonegen.h b/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/tonegen.h
index ec9e13f67207ae41527ef830107b2889d4045e6d..6b5a82d1d3808821254331c4ba4f86e36c81ba07 100644
--- a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/tonegen.h
+++ b/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/tonegen.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJMEDIA_TONEGEN_PORT_H__
#define __PJMEDIA_TONEGEN_PORT_H__
diff --git a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/transport.h b/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/transport.h
index c7f693f2ad41f3b2bcfffd39b14d1b2d8064aa3e..0b8a13671260c95f0b2721c74ab8d47765bb83a1 100644
--- a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/transport.h
+++ b/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/transport.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJMEDIA_TRANSPORT_H__
#define __PJMEDIA_TRANSPORT_H__
diff --git a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/transport_adapter_sample.h b/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/transport_adapter_sample.h
index 912a7a74d36913cd795497046b0738cd5160e279..c14c24356806488a523765da52f92bbe178621e7 100644
--- a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/transport_adapter_sample.h
+++ b/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/transport_adapter_sample.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJMEDIA_TRANSPORT_ADAPTER_SAMPLE_H__
#define __PJMEDIA_TRANSPORT_ADAPTER_SAMPLE_H__
diff --git a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/transport_ice.h b/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/transport_ice.h
index 507d86db5b226c26a1302b4e1bff947cd46d119a..69052c43579f39bf01fc94258ab1cde8264f6b1c 100644
--- a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/transport_ice.h
+++ b/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/transport_ice.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJMEDIA_TRANSPORT_ICE_H__
#define __PJMEDIA_TRANSPORT_ICE_H__
diff --git a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/transport_loop.h b/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/transport_loop.h
index 95b7dd11a01909c5dd8ba7b80b95099cdbc604f0..5d16348409f531739ab16907b73b99173cb63c5a 100644
--- a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/transport_loop.h
+++ b/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/transport_loop.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJMEDIA_TRANSPORT_LOOP_H__
#define __PJMEDIA_TRANSPORT_LOOP_H__
diff --git a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/transport_srtp.h b/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/transport_srtp.h
index 9faa45919c51086d20062c88672bde2af2a399ec..0923db6974e42fae0f2dce67a999ffac6443a2d0 100644
--- a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/transport_srtp.h
+++ b/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/transport_srtp.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJMEDIA_TRANSPORT_SRTP_H__
#define __PJMEDIA_TRANSPORT_SRTP_H__
diff --git a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/transport_udp.h b/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/transport_udp.h
index 071e87e34cbf48b8809ecb038d975280c2e55a38..b3dae6025778fbcaa8cb6c19facc8a95d394d3d7 100644
--- a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/transport_udp.h
+++ b/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/transport_udp.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJMEDIA_TRANSPORT_UDP_H__
#define __PJMEDIA_TRANSPORT_UDP_H__
diff --git a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/types.h b/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/types.h
index 9a6387beda91d1d098231925485d2be4b9605072..1a6dd3f19dbcc4d2526b55484ea0a01228039dec 100644
--- a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/types.h
+++ b/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/types.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJMEDIA_TYPES_H__
#define __PJMEDIA_TYPES_H__
diff --git a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/wav_playlist.h b/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/wav_playlist.h
index a45197cd514ef121009f4453b8da922f0a4e4412..e751b5199ee81f393f02dd5ca25705925217b855 100644
--- a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/wav_playlist.h
+++ b/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/wav_playlist.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJMEDIA_WAV_PLAYLIST_H__
#define __PJMEDIA_WAV_PLAYLIST_H__
diff --git a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/wav_port.h b/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/wav_port.h
index dac10fef7cdca2fca4f2ddccf022e0632a56d42a..1351ca2a490c6c0fee0b22c2438608f63eb4b72c 100644
--- a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/wav_port.h
+++ b/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/wav_port.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJMEDIA_WAV_PORT_H__
#define __PJMEDIA_WAV_PORT_H__
diff --git a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/wave.h b/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/wave.h
index adb2a01c99f593d2d72225a32507018fcda691ce..e917a623ca6ee4fae28d10f35c3ea9f06dbf8056 100644
--- a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/wave.h
+++ b/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/wave.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJMEDIA_WAVE_H__
#define __PJMEDIA_WAVE_H__
diff --git a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/wsola.h b/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/wsola.h
index f6f0190169eea5ae71d2b8cbf45f5964e38b924a..bf0bed59c402d8cc8cf95d83b1c1afc9a10728db 100644
--- a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/wsola.h
+++ b/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/wsola.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJMEDIA_WSOLA_H__
#define __PJMEDIA_WSOLA_H__
diff --git a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia_audiodev.h b/sflphone-common/libs/pjproject/pjmedia/include/pjmedia_audiodev.h
index 2c61e676c3849e170f7d5e1db282ea2a0d136e8c..15a58bdb2a5a98068df91ba0ad7aff93f32d0b88 100644
--- a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia_audiodev.h
+++ b/sflphone-common/libs/pjproject/pjmedia/include/pjmedia_audiodev.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJMEDIA_AUDIODEV_H__
#define __PJMEDIA_AUDIODEV_H__
diff --git a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia-audiodev/audiodev.c b/sflphone-common/libs/pjproject/pjmedia/src/pjmedia-audiodev/audiodev.c
index 034c7c924dc18a35c84795e9985dda7c5e0f4c82..39aebbbfc1a2cdc46420f951307487899819ff43 100644
--- a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia-audiodev/audiodev.c
+++ b/sflphone-common/libs/pjproject/pjmedia/src/pjmedia-audiodev/audiodev.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pjmedia-audiodev/audiodev_imp.h>
#include <pj/assert.h>
diff --git a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia-audiodev/audiotest.c b/sflphone-common/libs/pjproject/pjmedia/src/pjmedia-audiodev/audiotest.c
index 9f41651ff656beb5815f870d8019e7abf18c866f..c1d4905d84862315038aafb3a9eda3cf5646c75d 100644
--- a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia-audiodev/audiotest.c
+++ b/sflphone-common/libs/pjproject/pjmedia/src/pjmedia-audiodev/audiotest.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pjmedia-audiodev/audiotest.h>
#include <pjmedia-audiodev/audiodev.h>
diff --git a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia-audiodev/errno.c b/sflphone-common/libs/pjproject/pjmedia/src/pjmedia-audiodev/errno.c
index bbff067861dbfa9fa690114bc7968dcf16a7e066..759630c3f8cac3bf135eb3784677a4f5849e2282 100644
--- a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia-audiodev/errno.c
+++ b/sflphone-common/libs/pjproject/pjmedia/src/pjmedia-audiodev/errno.c
@@ -15,6 +15,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pjmedia-audiodev/errno.h>
#include <pj/string.h>
diff --git a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia-audiodev/legacy_dev.c b/sflphone-common/libs/pjproject/pjmedia/src/pjmedia-audiodev/legacy_dev.c
index c79bf2121ea56139caa0a7e9cdf90597d29e586c..5343d673114be1c50cfd9e3eec3603a8a8a7b3c8 100644
--- a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia-audiodev/legacy_dev.c
+++ b/sflphone-common/libs/pjproject/pjmedia/src/pjmedia-audiodev/legacy_dev.c
@@ -15,6 +15,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pjmedia-audiodev/audiodev_imp.h>
#include <pjmedia/sound.h>
diff --git a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia-audiodev/pa_dev.c b/sflphone-common/libs/pjproject/pjmedia/src/pjmedia-audiodev/pa_dev.c
index 32fb8bb02d5b4aff2f4fca1fa93dc8fc6e5b22dd..af31289748065615433891a86e93588c0865f4f6 100644
--- a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia-audiodev/pa_dev.c
+++ b/sflphone-common/libs/pjproject/pjmedia/src/pjmedia-audiodev/pa_dev.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pjmedia-audiodev/audiodev_imp.h>
#include <pj/assert.h>
diff --git a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia-audiodev/symb_aps_dev.cpp b/sflphone-common/libs/pjproject/pjmedia/src/pjmedia-audiodev/symb_aps_dev.cpp
index a7587a3968473e569a285e5bfc09c853011b81b1..a807a3d3507855f90882d85c9875074b4a24ad39 100644
--- a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia-audiodev/symb_aps_dev.cpp
+++ b/sflphone-common/libs/pjproject/pjmedia/src/pjmedia-audiodev/symb_aps_dev.cpp
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pjmedia-audiodev/audiodev_imp.h>
#include <pjmedia-audiodev/errno.h>
diff --git a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia-audiodev/symb_mda_dev.cpp b/sflphone-common/libs/pjproject/pjmedia/src/pjmedia-audiodev/symb_mda_dev.cpp
index d943f2bd25aa7c289c34e664a9aa6ff072e39a21..809604ccb5bffaafc62a059130cebb7c4a34af0d 100644
--- a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia-audiodev/symb_mda_dev.cpp
+++ b/sflphone-common/libs/pjproject/pjmedia/src/pjmedia-audiodev/symb_mda_dev.cpp
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pjmedia-audiodev/audiodev_imp.h>
#include <pjmedia-audiodev/errno.h>
diff --git a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia-audiodev/symb_vas_dev.cpp b/sflphone-common/libs/pjproject/pjmedia/src/pjmedia-audiodev/symb_vas_dev.cpp
index 93eb284404ee4d76d25c7abd9a9bb49386577e2f..74dcc5451ac339a4f88de4889705a78b2ca4479f 100644
--- a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia-audiodev/symb_vas_dev.cpp
+++ b/sflphone-common/libs/pjproject/pjmedia/src/pjmedia-audiodev/symb_vas_dev.cpp
@@ -15,6 +15,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pjmedia-audiodev/audiodev_imp.h>
#include <pjmedia-audiodev/errno.h>
diff --git a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia-audiodev/wmme_dev.c b/sflphone-common/libs/pjproject/pjmedia/src/pjmedia-audiodev/wmme_dev.c
index 66924d8f235ec639ac9eb07c0f55c7bd61d63fe7..1bf242a33abdd915fa23045642f3fd5fdea78c02 100644
--- a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia-audiodev/wmme_dev.c
+++ b/sflphone-common/libs/pjproject/pjmedia/src/pjmedia-audiodev/wmme_dev.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pjmedia-audiodev/audiodev_imp.h>
#include <pj/assert.h>
diff --git a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia-codec/g722.c b/sflphone-common/libs/pjproject/pjmedia/src/pjmedia-codec/g722.c
index 892dd0b6ecb46d51a1a6180a63b19fda4f11d3a6..2eaa90999cba88fd236dcd02d93eb52a8c3356ff 100644
--- a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia-codec/g722.c
+++ b/sflphone-common/libs/pjproject/pjmedia/src/pjmedia-codec/g722.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pjmedia-codec/g722.h>
#include <pjmedia/codec.h>
diff --git a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia-codec/g722/g722_dec.c b/sflphone-common/libs/pjproject/pjmedia/src/pjmedia-codec/g722/g722_dec.c
index ef4b6920dde66c4516f4409b90e888da3228714d..1bff3f8f40123e9add9710bf6ce4edb720a496d8 100644
--- a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia-codec/g722/g722_dec.c
+++ b/sflphone-common/libs/pjproject/pjmedia/src/pjmedia-codec/g722/g722_dec.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
/*
* Based on implementation found in Carnegie Mellon Speech Group Software
diff --git a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia-codec/g722/g722_dec.h b/sflphone-common/libs/pjproject/pjmedia/src/pjmedia-codec/g722/g722_dec.h
index 8d88e2571f958634e6a985ce428cb1f8dc46799c..fa3f7743577232bbb0b10462620ee967c1517986 100644
--- a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia-codec/g722/g722_dec.h
+++ b/sflphone-common/libs/pjproject/pjmedia/src/pjmedia-codec/g722/g722_dec.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
/*
* Based on implementation found in Carnegie Mellon Speech Group Software
diff --git a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia-codec/g722/g722_enc.c b/sflphone-common/libs/pjproject/pjmedia/src/pjmedia-codec/g722/g722_enc.c
index c10e09a984eeed66dcc23a4f9c2d09829c9cc454..ff926dfbea3fcfd4aaf6047e6c28e00551783233 100644
--- a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia-codec/g722/g722_enc.c
+++ b/sflphone-common/libs/pjproject/pjmedia/src/pjmedia-codec/g722/g722_enc.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
/*
* Based on implementation found in Carnegie Mellon Speech Group Software
diff --git a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia-codec/g722/g722_enc.h b/sflphone-common/libs/pjproject/pjmedia/src/pjmedia-codec/g722/g722_enc.h
index 628ffc1825ae996bb951503dab6a114bf31ee8d4..d9cf897b6f9b5d44bc577f974c927ffdfe2f9dd3 100644
--- a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia-codec/g722/g722_enc.h
+++ b/sflphone-common/libs/pjproject/pjmedia/src/pjmedia-codec/g722/g722_enc.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
/*
* Based on implementation found in Carnegie Mellon Speech Group Software
diff --git a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia-codec/g7221.c b/sflphone-common/libs/pjproject/pjmedia/src/pjmedia-codec/g7221.c
index 6c4a4bd7911ec6c0d999f3d178c7994b41365489..828ef16be9482aa780668408323a71217226a01e 100644
--- a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia-codec/g7221.c
+++ b/sflphone-common/libs/pjproject/pjmedia/src/pjmedia-codec/g7221.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pjmedia-codec/g7221.h>
#include <pjmedia/codec.h>
diff --git a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia-codec/gsm.c b/sflphone-common/libs/pjproject/pjmedia/src/pjmedia-codec/gsm.c
index 80041d7a8068d5d24b60cc9bff9256f93dc760ef..7dc3b55d09ec595fb522bb9096d688ff28ea098d 100644
--- a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia-codec/gsm.c
+++ b/sflphone-common/libs/pjproject/pjmedia/src/pjmedia-codec/gsm.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pjmedia-codec/gsm.h>
#include <pjmedia/codec.h>
diff --git a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia-codec/ilbc.c b/sflphone-common/libs/pjproject/pjmedia/src/pjmedia-codec/ilbc.c
index ddd92570a9ed7d0b8192b3a7b4369eec75b46e86..1b1dc8506859aaaf969c1550a85fb1520f85d5d2 100644
--- a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia-codec/ilbc.c
+++ b/sflphone-common/libs/pjproject/pjmedia/src/pjmedia-codec/ilbc.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pjmedia-codec/ilbc.h>
#include <pjmedia-codec/types.h>
diff --git a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia-codec/ipp_codecs.c b/sflphone-common/libs/pjproject/pjmedia/src/pjmedia-codec/ipp_codecs.c
index c272ba15120cd4ba13b3d0d62c6493743ecb3b5b..8647be268864173c5d1d32521f104acd247dc149 100644
--- a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia-codec/ipp_codecs.c
+++ b/sflphone-common/libs/pjproject/pjmedia/src/pjmedia-codec/ipp_codecs.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pjmedia-codec/ipp_codecs.h>
#include <pjmedia/codec.h>
diff --git a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia-codec/l16.c b/sflphone-common/libs/pjproject/pjmedia/src/pjmedia-codec/l16.c
index 8139074409000cd91df68b1652cd64931d166fa3..e77181aef9321fdac201f8dda9038ad8929ce6e8 100644
--- a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia-codec/l16.c
+++ b/sflphone-common/libs/pjproject/pjmedia/src/pjmedia-codec/l16.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pjmedia-codec/l16.h>
#include <pjmedia/codec.h>
diff --git a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia-codec/passthrough.c b/sflphone-common/libs/pjproject/pjmedia/src/pjmedia-codec/passthrough.c
index 884c3e954b38f82f0bec7f0f061aef4714b2b273..bb6151f604cb9cfb4d91a26638b46ed1503b8834 100644
--- a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia-codec/passthrough.c
+++ b/sflphone-common/libs/pjproject/pjmedia/src/pjmedia-codec/passthrough.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pjmedia-codec/passthrough.h>
#include <pjmedia/codec.h>
diff --git a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia-codec/speex_codec.c b/sflphone-common/libs/pjproject/pjmedia/src/pjmedia-codec/speex_codec.c
index be0e4b4c9f56a9a700de64c91178ae39dc95b4c8..0d45f1c78009d3cf1675791598d9116911c19208 100644
--- a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia-codec/speex_codec.c
+++ b/sflphone-common/libs/pjproject/pjmedia/src/pjmedia-codec/speex_codec.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pjmedia-codec/speex.h>
diff --git a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/alaw_ulaw_table.c b/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/alaw_ulaw_table.c
index 8392c1f566e17c56a4a6a04a4b001c28528cf5a3..47d4cf20b54d64db36a6f21dfcee2233f015bd58 100644
--- a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/alaw_ulaw_table.c
+++ b/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/alaw_ulaw_table.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
/*
diff --git a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/bidirectional.c b/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/bidirectional.c
index fe5ea2180bc067d12730e8af8ad94475781ccf40..52eeefcf389c41de2239156ef12cc6d7259cb00e 100644
--- a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/bidirectional.c
+++ b/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/bidirectional.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pjmedia/bidirectional.h>
#include <pj/pool.h>
diff --git a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/clock_thread.c b/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/clock_thread.c
index 2659f93b8859164edad8ca8b66217ee4331a2439..a3803e2bac3d3d6923e3e66d9ab7ba63e02bd967 100644
--- a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/clock_thread.c
+++ b/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/clock_thread.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pjmedia/clock.h>
#include <pjmedia/errno.h>
diff --git a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/codec.c b/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/codec.c
index 9fe0e2dbdc9eefb4bebb284d9830ad0e0b1e155e..1f5c2340481eda3ef9f818a011913c97024110ad 100644
--- a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/codec.c
+++ b/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/codec.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pjmedia/codec.h>
#include <pjmedia/errno.h>
diff --git a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/conf_switch.c b/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/conf_switch.c
index 53f0d20d54f5394a360dad2283f4c42625af439c..499deb99e92e123ba2d3634cdf9970addfed920c 100644
--- a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/conf_switch.c
+++ b/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/conf_switch.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pjmedia/conference.h>
#include <pjmedia/alaw_ulaw.h>
diff --git a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/conference.c b/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/conference.c
index cbdbc4f443102f5a55920902cc5b8739b83c3b8e..413edf8da897659e2c7f791975ac383d9b97a7eb 100644
--- a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/conference.c
+++ b/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/conference.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pjmedia/conference.h>
#include <pjmedia/alaw_ulaw.h>
diff --git a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/delaybuf.c b/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/delaybuf.c
index 360f9044076fad0f5270d908740619257c243ea1..667bcdbe9ab90d1c58e124604711772a994a79af 100644
--- a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/delaybuf.c
+++ b/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/delaybuf.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pjmedia/delaybuf.h>
diff --git a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/echo_common.c b/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/echo_common.c
index 9852a56f95b3280f7fa9d03a9b6f0feb8dd2d6f8..5cb9c8725ca59d53d5efb91ff839cb79051de1e2 100644
--- a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/echo_common.c
+++ b/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/echo_common.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pjmedia/echo.h>
diff --git a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/echo_internal.h b/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/echo_internal.h
index f70ed708e7f7588e98ac41bf23af73e996e4ffb0..6757efa18d6fcb87311e49026200d4f455e88049 100644
--- a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/echo_internal.h
+++ b/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/echo_internal.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJMEDIA_ECHO_INTERNAL_H__
#define __PJMEDIA_ECHO_INTERNAL_H__
diff --git a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/echo_port.c b/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/echo_port.c
index 233d5ad3923fb60572f1fa062e1b301043561e2e..8779a929c6dfe6e86bc63d6a0278b95bdbf008d7 100644
--- a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/echo_port.c
+++ b/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/echo_port.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pjmedia/echo_port.h>
#include <pjmedia/echo.h>
diff --git a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/echo_speex.c b/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/echo_speex.c
index 9975c842250dc08dd5e2c365efdf688f40c36656..300a56003aa1d220a49a8df35bb877f15e20acb4 100644
--- a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/echo_speex.c
+++ b/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/echo_speex.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pjmedia/echo.h>
diff --git a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/echo_suppress.c b/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/echo_suppress.c
index 60ee9b454c17983a46a67b9a095e1f3fafbfdfbc..dbf42ad9c4bd745576f8d953e619d41842c55f5d 100644
--- a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/echo_suppress.c
+++ b/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/echo_suppress.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pjmedia/types.h>
#include <pjmedia/alaw_ulaw.h>
diff --git a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/endpoint.c b/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/endpoint.c
index 3df56497cb1057a02fc5c2cc183745e96f8423be..2c2c6cfe67d04662086effe264246032e2a08033 100644
--- a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/endpoint.c
+++ b/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/endpoint.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pjmedia/endpoint.h>
#include <pjmedia/errno.h>
diff --git a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/errno.c b/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/errno.c
index 2853d1aa3c395f5c99c799af99dd4d46f1566bc4..0820b7bbce81092982acce8d4769d90e24a4afbb 100644
--- a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/errno.c
+++ b/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/errno.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pjmedia/errno.h>
#include <pjmedia/types.h>
diff --git a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/g711.c b/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/g711.c
index 3d7aeb063636e2d2b1e8d2d11d1af150d547dbab..041dfa0b0f5d814095b35c04d674102b758db4d1 100644
--- a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/g711.c
+++ b/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/g711.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
/* This file contains file from Sun Microsystems, Inc, with the complete
* notice in the second half of this file.
diff --git a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/jbuf.c b/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/jbuf.c
index 3cdcc6acbdf5db874bec5c1950b2528af8e694bd..7a6803168068a61738c85b405e6513ab62cd5afc 100644
--- a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/jbuf.c
+++ b/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/jbuf.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
/*
* Based on implementation kindly contributed by Switchlab, Ltd.
diff --git a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/master_port.c b/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/master_port.c
index e604af7b6224b90e9d343f3f687f407ef40e3087..96b7732497aceaa7b9c912d5d5e2414ced2869d9 100644
--- a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/master_port.c
+++ b/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/master_port.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pjmedia/master_port.h>
#include <pjmedia/clock.h>
diff --git a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/mem_capture.c b/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/mem_capture.c
index 4c998dd0a6ac4ce073d838ba2b28bdec8d8b9808..28f910407f924d7a6f21e9752619c4e8f5401c7b 100644
--- a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/mem_capture.c
+++ b/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/mem_capture.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pjmedia/mem_port.h>
#include <pj/assert.h>
diff --git a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/mem_player.c b/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/mem_player.c
index 11f7220af041e847f0fae7bc47ad8c9c72eba134..61a0864684fa9ecf7348f5d51c356b07ed883c09 100644
--- a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/mem_player.c
+++ b/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/mem_player.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pjmedia/mem_port.h>
#include <pj/assert.h>
diff --git a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/null_port.c b/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/null_port.c
index 57d76d6998f1ba21e582d6aac71e44b1e0693e17..92fe0074b49e33f4eb9b22789610309ec79eec55 100644
--- a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/null_port.c
+++ b/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/null_port.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pjmedia/null_port.h>
#include <pjmedia/errno.h>
diff --git a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/plc_common.c b/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/plc_common.c
index d5e8a0ac568fa1c203d6e0c6c660bbc2b9eaaa1f..ab5591d93ffb8af76798ddf6f7b1788136c47719 100644
--- a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/plc_common.c
+++ b/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/plc_common.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pjmedia/plc.h>
#include <pjmedia/errno.h>
diff --git a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/port.c b/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/port.c
index 6da062490f27d98ad01f36089ab0e3805f0d8890..e097de5e37f86fa987d42c77109f46a6132811a3 100644
--- a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/port.c
+++ b/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/port.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pjmedia/port.h>
#include <pjmedia/errno.h>
diff --git a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/resample_libsamplerate.c b/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/resample_libsamplerate.c
index 63ce87ac54e91e6309fb745c7bdaaa12dbca3d39..7c0686062d3c8a31e46daad0af721b67ab4ef76c 100644
--- a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/resample_libsamplerate.c
+++ b/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/resample_libsamplerate.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pjmedia/resample.h>
#include <pjmedia/errno.h>
diff --git a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/resample_port.c b/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/resample_port.c
index 588833531b0f17bcc880a90e9fc511c766a72cf0..634ca7110d2a44cf402965166d08945de3a1f8cf 100644
--- a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/resample_port.c
+++ b/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/resample_port.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pjmedia/resample.h>
#include <pjmedia/errno.h>
diff --git a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/resample_resample.c b/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/resample_resample.c
index 7efbbbe12180791f56b8cdf6055b9226cd0dce45..bad1e3f0e7a657c9c1b8ea01ec0dce2d8c0755e6 100644
--- a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/resample_resample.c
+++ b/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/resample_resample.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pjmedia/resample.h>
diff --git a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/resample_speex.c b/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/resample_speex.c
index 9c414c43aabff0a929a68c168263453019b9fb89..5047778b7519c6fe0c488edd1d9d9e28ff67eeaf 100644
--- a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/resample_speex.c
+++ b/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/resample_speex.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pjmedia/resample.h>
#include <pjmedia/errno.h>
diff --git a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/rtcp.c b/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/rtcp.c
index 752f19b9ef3430c8a1629d41c203dab8319f74e9..d911eba08f789c77546381a836a80daddcbc58f4 100644
--- a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/rtcp.c
+++ b/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/rtcp.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pjmedia/rtcp.h>
#include <pjmedia/errno.h>
diff --git a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/rtcp_xr.c b/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/rtcp_xr.c
index 49e007b03947b3f852a4ac4d6f2e2dee8ffa5851..adc39c774256b5c2105305c717e1794d449f0157 100644
--- a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/rtcp_xr.c
+++ b/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/rtcp_xr.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pjmedia/rtcp_xr.h>
diff --git a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/rtp.c b/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/rtp.c
index fbebb155f6732a3f079666948255355168619365..3df690e7abfca2dc6eb8d0576753c55739741e70 100644
--- a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/rtp.c
+++ b/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/rtp.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pjmedia/rtp.h>
#include <pjmedia/errno.h>
diff --git a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/sdp.c b/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/sdp.c
index 2a44d2f62e7aa009b3f77b0c5e845f8f165f4785..1fe59f7afba20873b2f887367f900f478b77c8b0 100644
--- a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/sdp.c
+++ b/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/sdp.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pjmedia/sdp.h>
#include <pjmedia/errno.h>
diff --git a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/sdp_cmp.c b/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/sdp_cmp.c
index 986df3f57f31a6fb4164c95881b398468e2bb24d..2d0d02014fa6a94c4e64fcc17d05add8e1227d15 100644
--- a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/sdp_cmp.c
+++ b/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/sdp_cmp.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pjmedia/sdp.h>
#include <pjmedia/errno.h>
diff --git a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/sdp_neg.c b/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/sdp_neg.c
index 9e283027dd999409ad2d5b2bc065f9cfeb393178..c698bdc0c98f8cc4e64942a1bb9b1092e7007c2d 100644
--- a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/sdp_neg.c
+++ b/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/sdp_neg.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pjmedia/sdp_neg.h>
#include <pjmedia/sdp.h>
diff --git a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/sdp_wrap.cpp b/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/sdp_wrap.cpp
index dd5b8fd09cb13bf51740f6a9a199bcfa927ee63f..6bae3ff65fedf3e50b6d292cc4ba534adfcf1246 100644
--- a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/sdp_wrap.cpp
+++ b/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/sdp_wrap.cpp
@@ -15,6 +15,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
/*
diff --git a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/session.c b/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/session.c
index 6a33c84a409f331a99fa06ff3240dcb8898d4a1b..5240426b9dca7a667cfcf964897a36aaabc990ca 100644
--- a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/session.c
+++ b/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/session.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pjmedia/session.h>
#include <pjmedia/errno.h>
diff --git a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/silencedet.c b/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/silencedet.c
index 0b93062679904c47949a6d807bfe4d51cb8b4472..dd57bdd20b13b27a23c85bd17d69a1e83b52077e 100644
--- a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/silencedet.c
+++ b/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/silencedet.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pjmedia/silencedet.h>
#include <pjmedia/alaw_ulaw.h>
diff --git a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/sound_legacy.c b/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/sound_legacy.c
index 868f78c1520fb7269ce285d10b1e1acd15b369ce..7871c69dddb393567e10ad17db9e3fdb954798d1 100644
--- a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/sound_legacy.c
+++ b/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/sound_legacy.c
@@ -15,6 +15,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
/*
diff --git a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/sound_port.c b/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/sound_port.c
index 372e2ef8f4995c4dbeb3e7b52788755a2307f73e..f1033f510f1157bbb35fdafa777a22d6ed0d05b8 100644
--- a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/sound_port.c
+++ b/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/sound_port.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pjmedia/sound_port.h>
#include <pjmedia/alaw_ulaw.h>
diff --git a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/splitcomb.c b/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/splitcomb.c
index 08457b8bff7f071737337e0abf0145ce520cd350..f21466ace5b7ced0a1a068948d8ed2d533da8130 100644
--- a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/splitcomb.c
+++ b/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/splitcomb.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pjmedia/splitcomb.h>
#include <pjmedia/delaybuf.h>
diff --git a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/stereo_port.c b/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/stereo_port.c
index 97ee6dcd92610ca7e156dd201179e3895f0cf978..2be7a48f91993de5448cb20d0e7d4189f1a3f672 100644
--- a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/stereo_port.c
+++ b/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/stereo_port.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pjmedia/stereo.h>
diff --git a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/stream.c b/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/stream.c
index 3331c9b84d76ee29cd18308a184550eed026dde4..9033b2e2ff8dcafc180200c695acf5d3730e1df2 100644
--- a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/stream.c
+++ b/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/stream.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pjmedia/stream.h>
#include <pjmedia/errno.h>
diff --git a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/tonegen.c b/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/tonegen.c
index 757544913bcba5bd86adc54c72f2a49e719b1174..50ecc42d34c280eee8b17421a637cf05d7411b76 100644
--- a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/tonegen.c
+++ b/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/tonegen.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pjmedia/tonegen.h>
#include <pjmedia/errno.h>
diff --git a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/transport_adapter_sample.c b/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/transport_adapter_sample.c
index b42ffd6f587eeecb140515da2dbe8d9492030190..6e68e528e1cd54503615ee86e9df41543028e056 100644
--- a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/transport_adapter_sample.c
+++ b/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/transport_adapter_sample.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pjmedia/transport_adapter_sample.h>
#include <pjmedia/endpoint.h>
diff --git a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/transport_ice.c b/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/transport_ice.c
index 2bf078273ad3204c19c537f5f55a7165c0a6b6c8..a4795d794db1a67a257f605fa87f539220640234 100644
--- a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/transport_ice.c
+++ b/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/transport_ice.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pjmedia/transport_ice.h>
#include <pjnath/errno.h>
diff --git a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/transport_loop.c b/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/transport_loop.c
index 244af6d7ccf307697a712cc85af4de7fb95663ab..dabb26e3642a2312c9c35af6b18615829adac439 100644
--- a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/transport_loop.c
+++ b/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/transport_loop.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pjmedia/transport_loop.h>
#include <pj/array.h>
diff --git a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/transport_srtp.c b/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/transport_srtp.c
index ae3b52ebc88a897d84e8bb8125df323ded91d63c..f0d2ce0df44d8e5e1368460e82e5ad04d788a4c3 100644
--- a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/transport_srtp.c
+++ b/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/transport_srtp.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pjmedia/transport_srtp.h>
diff --git a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/transport_udp.c b/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/transport_udp.c
index 8b317e7b9b170c65dcccc9658f89151e8bcde5be..089a22b5270af8e5e8aff4a87807be4a3de45aaf 100644
--- a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/transport_udp.c
+++ b/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/transport_udp.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pjmedia/transport_udp.h>
#include <pj/addr_resolv.h>
diff --git a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/wav_player.c b/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/wav_player.c
index 8a2547fb6fdab29ce40a248579c985bb522231a2..715e36101d465cc65f4a4a5960a4290096df1618 100644
--- a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/wav_player.c
+++ b/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/wav_player.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pjmedia/wav_port.h>
#include <pjmedia/alaw_ulaw.h>
diff --git a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/wav_playlist.c b/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/wav_playlist.c
index 5c5345b224e4effc47f34a70a279c837b559f65a..d12b58a8b947501a728bce3e1bd04f72efc092f3 100644
--- a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/wav_playlist.c
+++ b/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/wav_playlist.c
@@ -19,6 +19,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pjmedia/wav_playlist.h>
#include <pjmedia/errno.h>
diff --git a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/wav_writer.c b/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/wav_writer.c
index df6a3edc2304c2a57e9b94aa22c5bfa8b3d3f4e1..262a734a2be81e43d01007bf98b4a6406e62e699 100644
--- a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/wav_writer.c
+++ b/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/wav_writer.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pjmedia/wav_port.h>
#include <pjmedia/alaw_ulaw.h>
diff --git a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/wave.c b/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/wave.c
index b229924333ca9cbe5690db027f1ce1f8c8ec2a64..4f4ae8a5ac4504db0a3b76fabef4ab556c9e87e3 100644
--- a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/wave.c
+++ b/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/wave.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pjmedia/wave.h>
diff --git a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/wsola.c b/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/wsola.c
index 1d8ac99a9f0ea768cd2486fbd5c8c652a8fc30eb..6f975e214d2b6b6ec3ee17cf02049ba97de39167 100644
--- a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/wsola.c
+++ b/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/wsola.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pjmedia/wsola.h>
#include <pjmedia/circbuf.h>
diff --git a/sflphone-common/libs/pjproject/pjmedia/src/test/audio_tool.c b/sflphone-common/libs/pjproject/pjmedia/src/test/audio_tool.c
index 9871c2c5dac51f49f262797a382bd8dc59a950ee..e6d0055c0758da1f10f150627ec29335acbc2e6f 100644
--- a/sflphone-common/libs/pjproject/pjmedia/src/test/audio_tool.c
+++ b/sflphone-common/libs/pjproject/pjmedia/src/test/audio_tool.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pjmedia.h>
#include <pjlib.h>
diff --git a/sflphone-common/libs/pjproject/pjmedia/src/test/codec_vectors.c b/sflphone-common/libs/pjproject/pjmedia/src/test/codec_vectors.c
index 5508805922a5c9a0326d3d71f0c23c0a202d85ce..7af60330cd4ae990bf2025b04268b00e1014dbe1 100644
--- a/sflphone-common/libs/pjproject/pjmedia/src/test/codec_vectors.c
+++ b/sflphone-common/libs/pjproject/pjmedia/src/test/codec_vectors.c
@@ -15,6 +15,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include "test.h"
#include <pjmedia-codec.h>
diff --git a/sflphone-common/libs/pjproject/pjmedia/src/test/jbuf_test.c b/sflphone-common/libs/pjproject/pjmedia/src/test/jbuf_test.c
index 24ab5929a1dd7b9df0b51e1c7fe1aa0e9d58a4eb..24f772304d12c4cd2c9af4ea5b0aeffcfbb64e31 100644
--- a/sflphone-common/libs/pjproject/pjmedia/src/test/jbuf_test.c
+++ b/sflphone-common/libs/pjproject/pjmedia/src/test/jbuf_test.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <stdio.h>
#include <ctype.h>
diff --git a/sflphone-common/libs/pjproject/pjmedia/src/test/main.c b/sflphone-common/libs/pjproject/pjmedia/src/test/main.c
index 2a4cf8776cbca241d048ae632615ab64401c8517..db6a6e2ce1fb87e8ee2db04f7f56b2049f70492f 100644
--- a/sflphone-common/libs/pjproject/pjmedia/src/test/main.c
+++ b/sflphone-common/libs/pjproject/pjmedia/src/test/main.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include "test.h"
diff --git a/sflphone-common/libs/pjproject/pjmedia/src/test/mips_test.c b/sflphone-common/libs/pjproject/pjmedia/src/test/mips_test.c
index d5cdcd3112bcb0d6a7e84882988cfa63987d0d06..56249fbcd437a2743f0bdfaf7e87f263a15bf497 100644
--- a/sflphone-common/libs/pjproject/pjmedia/src/test/mips_test.c
+++ b/sflphone-common/libs/pjproject/pjmedia/src/test/mips_test.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include "test.h"
#include <pjmedia-codec.h>
diff --git a/sflphone-common/libs/pjproject/pjmedia/src/test/rtp_test.c b/sflphone-common/libs/pjproject/pjmedia/src/test/rtp_test.c
index 21580d2a1e476d32ca69af2d3c44f50643928b3e..b6141c8a679e8e8ce7cac9d74ffaff78432e4e0e 100644
--- a/sflphone-common/libs/pjproject/pjmedia/src/test/rtp_test.c
+++ b/sflphone-common/libs/pjproject/pjmedia/src/test/rtp_test.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pjmedia/rtp.h>
#include <stdio.h>
diff --git a/sflphone-common/libs/pjproject/pjmedia/src/test/sdp_neg_test.c b/sflphone-common/libs/pjproject/pjmedia/src/test/sdp_neg_test.c
index 437bd41301b8387b0a743e21bee7e69a482cec1d..991ebf5343481ac6dc1b2ae9a6880d3ea1830a42 100644
--- a/sflphone-common/libs/pjproject/pjmedia/src/test/sdp_neg_test.c
+++ b/sflphone-common/libs/pjproject/pjmedia/src/test/sdp_neg_test.c
@@ -16,6 +16,17 @@
* You should have received a copy oa the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pjmedia/sdp.h>
#include <pjmedia/sdp_neg.h>
diff --git a/sflphone-common/libs/pjproject/pjmedia/src/test/sdptest.c b/sflphone-common/libs/pjproject/pjmedia/src/test/sdptest.c
index 7930ac6281f17f47d9d151004018420de69f0bfa..751bbb31d2f788c2ab888f4b5afc753011944ea2 100644
--- a/sflphone-common/libs/pjproject/pjmedia/src/test/sdptest.c
+++ b/sflphone-common/libs/pjproject/pjmedia/src/test/sdptest.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pjmedia/sdp.h>
#include <pj/os.h>
diff --git a/sflphone-common/libs/pjproject/pjmedia/src/test/session_test.c b/sflphone-common/libs/pjproject/pjmedia/src/test/session_test.c
index 8761457e91069a1252b2b17c22f65f232b0b2abb..51dbb7e0325552eac4f1e3b5ab91de18a44cd5a2 100644
--- a/sflphone-common/libs/pjproject/pjmedia/src/test/session_test.c
+++ b/sflphone-common/libs/pjproject/pjmedia/src/test/session_test.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pjmedia/mediamgr.h>
#include <pjmedia/session.h>
diff --git a/sflphone-common/libs/pjproject/pjmedia/src/test/test.c b/sflphone-common/libs/pjproject/pjmedia/src/test/test.c
index 19bc3e35291eee5ecbb3077a31c8fdd02b875aa6..093db7a6a6a7aa546e2622855b2485d91349a312 100644
--- a/sflphone-common/libs/pjproject/pjmedia/src/test/test.c
+++ b/sflphone-common/libs/pjproject/pjmedia/src/test/test.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include "test.h"
diff --git a/sflphone-common/libs/pjproject/pjmedia/src/test/test.h b/sflphone-common/libs/pjproject/pjmedia/src/test/test.h
index c669ba681a29d858e1031e42859ef59d22f993e6..53819eb7d19afb11ec9a7f4cb29ab3cc31ae3c1c 100644
--- a/sflphone-common/libs/pjproject/pjmedia/src/test/test.h
+++ b/sflphone-common/libs/pjproject/pjmedia/src/test/test.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJMEDIA_TEST_H__
#define __PJMEDIA_TEST_H__
diff --git a/sflphone-common/libs/pjproject/pjmedia/src/test/wince_main.c b/sflphone-common/libs/pjproject/pjmedia/src/test/wince_main.c
index b85376a77d67998cc1fb9120f7b69b180f407cb3..28046c8af0313df4ce40559aeba0e2ad6611ecdc 100644
--- a/sflphone-common/libs/pjproject/pjmedia/src/test/wince_main.c
+++ b/sflphone-common/libs/pjproject/pjmedia/src/test/wince_main.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include "test.h"
#include <windows.h>
diff --git a/sflphone-common/libs/pjproject/pjnath/include/pjnath.h b/sflphone-common/libs/pjproject/pjnath/include/pjnath.h
index 6c1ebf1e34bc0af8e8f174c6893a48bf89d56463..75ed32b375f8ff76a7a4a5450a336b2723f10811 100644
--- a/sflphone-common/libs/pjproject/pjnath/include/pjnath.h
+++ b/sflphone-common/libs/pjproject/pjnath/include/pjnath.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pjnath/config.h>
diff --git a/sflphone-common/libs/pjproject/pjnath/include/pjnath/config.h b/sflphone-common/libs/pjproject/pjnath/include/pjnath/config.h
index 5a5ebac783aad94a58b2bb75e7dbef990cecefc9..728897732a62129c6cba0a87bcbf4fa1d20e3ec6 100644
--- a/sflphone-common/libs/pjproject/pjnath/include/pjnath/config.h
+++ b/sflphone-common/libs/pjproject/pjnath/include/pjnath/config.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJNATH_CONFIG_H__
#define __PJNATH_CONFIG_H__
diff --git a/sflphone-common/libs/pjproject/pjnath/include/pjnath/errno.h b/sflphone-common/libs/pjproject/pjnath/include/pjnath/errno.h
index a09cd3e1e8bb2a626c9a8574350eaf8338798775..f19b69b57273a9b3f49b20c90de6f25c03acde4f 100644
--- a/sflphone-common/libs/pjproject/pjnath/include/pjnath/errno.h
+++ b/sflphone-common/libs/pjproject/pjnath/include/pjnath/errno.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJNATH_ERRNO_H__
#define __PJNATH_ERRNO_H__
diff --git a/sflphone-common/libs/pjproject/pjnath/include/pjnath/ice_session.h b/sflphone-common/libs/pjproject/pjnath/include/pjnath/ice_session.h
index 30f0d5f09381d6807a3cb6b067c4f32aacedcf91..ef61282a8ddffdbbd64d9fc344b3bd4aa711c4e4 100644
--- a/sflphone-common/libs/pjproject/pjnath/include/pjnath/ice_session.h
+++ b/sflphone-common/libs/pjproject/pjnath/include/pjnath/ice_session.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJNATH_ICE_SESSION_H__
#define __PJNATH_ICE_SESSION_H__
diff --git a/sflphone-common/libs/pjproject/pjnath/include/pjnath/ice_strans.h b/sflphone-common/libs/pjproject/pjnath/include/pjnath/ice_strans.h
index c576f4551e47c4acb4ac0618ac5897d00dd631ba..57fd58d0d17e781a872a9e9024a0c3bdf8009fe1 100644
--- a/sflphone-common/libs/pjproject/pjnath/include/pjnath/ice_strans.h
+++ b/sflphone-common/libs/pjproject/pjnath/include/pjnath/ice_strans.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJNATH_ICE_STRANS_H__
#define __PJNATH_ICE_STRANS_H__
diff --git a/sflphone-common/libs/pjproject/pjnath/include/pjnath/nat_detect.h b/sflphone-common/libs/pjproject/pjnath/include/pjnath/nat_detect.h
index fc86718c4abed0b5f1407b6765f4929bbc94655d..643ea6e2488104289080827c3b68ab5d87854304 100644
--- a/sflphone-common/libs/pjproject/pjnath/include/pjnath/nat_detect.h
+++ b/sflphone-common/libs/pjproject/pjnath/include/pjnath/nat_detect.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJNATH_NAT_DETECT_H__
#define __PJNATH_NAT_DETECT_H__
diff --git a/sflphone-common/libs/pjproject/pjnath/include/pjnath/stun_auth.h b/sflphone-common/libs/pjproject/pjnath/include/pjnath/stun_auth.h
index e0fd17511e6473e244303ec1efcd1fdff2aa05e1..60fbbf5d715e22c066fea39dad84badafb369ab6 100644
--- a/sflphone-common/libs/pjproject/pjnath/include/pjnath/stun_auth.h
+++ b/sflphone-common/libs/pjproject/pjnath/include/pjnath/stun_auth.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJNATH_STUN_AUTH_H__
#define __PJNATH_STUN_AUTH_H__
diff --git a/sflphone-common/libs/pjproject/pjnath/include/pjnath/stun_config.h b/sflphone-common/libs/pjproject/pjnath/include/pjnath/stun_config.h
index d72abe6029ec786c52a5ef04bac10c31308fe518..ffe8bfb09881c1f37eea398ab12531c9062ba20d 100644
--- a/sflphone-common/libs/pjproject/pjnath/include/pjnath/stun_config.h
+++ b/sflphone-common/libs/pjproject/pjnath/include/pjnath/stun_config.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJNATH_STUN_CONFIG_H__
#define __PJNATH_STUN_CONFIG_H__
diff --git a/sflphone-common/libs/pjproject/pjnath/include/pjnath/stun_msg.h b/sflphone-common/libs/pjproject/pjnath/include/pjnath/stun_msg.h
index 8a838c3d2269754ee44c8fc0c6ec8bff0d442a56..ae00ffaa21b9d6e536e103018bdd4f1f297d0bcd 100644
--- a/sflphone-common/libs/pjproject/pjnath/include/pjnath/stun_msg.h
+++ b/sflphone-common/libs/pjproject/pjnath/include/pjnath/stun_msg.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJNATH_STUN_MSG_H__
#define __PJNATH_STUN_MSG_H__
diff --git a/sflphone-common/libs/pjproject/pjnath/include/pjnath/stun_session.h b/sflphone-common/libs/pjproject/pjnath/include/pjnath/stun_session.h
index 53108e9add9f85edd71c4b8e4588cffd30bd84a8..12ad7d8924e66413cd327ff14274c6bd26161025 100644
--- a/sflphone-common/libs/pjproject/pjnath/include/pjnath/stun_session.h
+++ b/sflphone-common/libs/pjproject/pjnath/include/pjnath/stun_session.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJNATH_STUN_SESSION_H__
#define __PJNATH_STUN_SESSION_H__
diff --git a/sflphone-common/libs/pjproject/pjnath/include/pjnath/stun_sock.h b/sflphone-common/libs/pjproject/pjnath/include/pjnath/stun_sock.h
index a4fd2676c2e13998b9a9767fca8853da98cc78dc..a3f3a59628dc3e5c5f860d62d959eb717e91900e 100644
--- a/sflphone-common/libs/pjproject/pjnath/include/pjnath/stun_sock.h
+++ b/sflphone-common/libs/pjproject/pjnath/include/pjnath/stun_sock.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJNATH_STUN_SOCK_H__
#define __PJNATH_STUN_SOCK_H__
diff --git a/sflphone-common/libs/pjproject/pjnath/include/pjnath/stun_transaction.h b/sflphone-common/libs/pjproject/pjnath/include/pjnath/stun_transaction.h
index addb02262f627e52bc2bef616d11f1915199a767..067d3cd69013545509fc84928e28beb8bdf26dec 100644
--- a/sflphone-common/libs/pjproject/pjnath/include/pjnath/stun_transaction.h
+++ b/sflphone-common/libs/pjproject/pjnath/include/pjnath/stun_transaction.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJNATH_STUN_TRANSACTION_H__
#define __PJNATH_STUN_TRANSACTION_H__
diff --git a/sflphone-common/libs/pjproject/pjnath/include/pjnath/turn_session.h b/sflphone-common/libs/pjproject/pjnath/include/pjnath/turn_session.h
index 7ea6ed2ecceeb55b1054073d04bf7c28ab98d6a2..50f6a4e6016a18a31c60e38e8f2592f205b377b7 100644
--- a/sflphone-common/libs/pjproject/pjnath/include/pjnath/turn_session.h
+++ b/sflphone-common/libs/pjproject/pjnath/include/pjnath/turn_session.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJNATH_TURN_SESSION_H__
#define __PJNATH_TURN_SESSION_H__
diff --git a/sflphone-common/libs/pjproject/pjnath/include/pjnath/turn_sock.h b/sflphone-common/libs/pjproject/pjnath/include/pjnath/turn_sock.h
index 3bbb26ce13a9f35faeddf33ff67e2b98cda61380..8fc54de6270e1845aadd6b21603ac82a5dbb1536 100644
--- a/sflphone-common/libs/pjproject/pjnath/include/pjnath/turn_sock.h
+++ b/sflphone-common/libs/pjproject/pjnath/include/pjnath/turn_sock.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJNATH_TURN_SOCK_H__
#define __PJNATH_TURN_SOCK_H__
diff --git a/sflphone-common/libs/pjproject/pjnath/include/pjnath/types.h b/sflphone-common/libs/pjproject/pjnath/include/pjnath/types.h
index 84420040b0c5aa1757f43d628c0d4ce1a4be6341..4aa8f1874abb52117525c09d0b47a4ae0eb23e2a 100644
--- a/sflphone-common/libs/pjproject/pjnath/include/pjnath/types.h
+++ b/sflphone-common/libs/pjproject/pjnath/include/pjnath/types.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJNATH_TYPES_H__
#define __PJNATH_TYPES_H__
diff --git a/sflphone-common/libs/pjproject/pjnath/src/pjnath-test/ice_test.c b/sflphone-common/libs/pjproject/pjnath/src/pjnath-test/ice_test.c
index 9a5e87154c6ad6971e30cefc53c9b285f202c126..7786536ec4a96902ac19da4d04456eba390d5f74 100644
--- a/sflphone-common/libs/pjproject/pjnath/src/pjnath-test/ice_test.c
+++ b/sflphone-common/libs/pjproject/pjnath/src/pjnath-test/ice_test.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include "test.h"
#include "server.h"
diff --git a/sflphone-common/libs/pjproject/pjnath/src/pjnath-test/main.c b/sflphone-common/libs/pjproject/pjnath/src/pjnath-test/main.c
index 301636dbe7f8509def181ef3ca482da24bdbc05d..a2c254e772dee4bf05815143938d42c502bc2843 100644
--- a/sflphone-common/libs/pjproject/pjnath/src/pjnath-test/main.c
+++ b/sflphone-common/libs/pjproject/pjnath/src/pjnath-test/main.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include "test.h"
diff --git a/sflphone-common/libs/pjproject/pjnath/src/pjnath-test/server.c b/sflphone-common/libs/pjproject/pjnath/src/pjnath-test/server.c
index de5d7b29658425f972291689e4a3c64de3d99b97..25b74d37f06c6655d2118bca084bfe2f1d8ec1c2 100644
--- a/sflphone-common/libs/pjproject/pjnath/src/pjnath-test/server.c
+++ b/sflphone-common/libs/pjproject/pjnath/src/pjnath-test/server.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include "server.h"
#include "test.h"
diff --git a/sflphone-common/libs/pjproject/pjnath/src/pjnath-test/server.h b/sflphone-common/libs/pjproject/pjnath/src/pjnath-test/server.h
index 13145450f99b5afaffdeffa5788cf8dcdff9cd63..c1d6555709bd344306f8b0cef6789692cf888ca6 100644
--- a/sflphone-common/libs/pjproject/pjnath/src/pjnath-test/server.h
+++ b/sflphone-common/libs/pjproject/pjnath/src/pjnath-test/server.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJNATH_TEST_SERVER_H__
#define __PJNATH_TEST_SERVER_H__
diff --git a/sflphone-common/libs/pjproject/pjnath/src/pjnath-test/sess_auth.c b/sflphone-common/libs/pjproject/pjnath/src/pjnath-test/sess_auth.c
index 93ad162393301ae938fd7d48162fefa357bedbb4..d53eabfa584cd4d213876e9eb9bfacfc73d3ba6d 100644
--- a/sflphone-common/libs/pjproject/pjnath/src/pjnath-test/sess_auth.c
+++ b/sflphone-common/libs/pjproject/pjnath/src/pjnath-test/sess_auth.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include "test.h"
diff --git a/sflphone-common/libs/pjproject/pjnath/src/pjnath-test/stun.c b/sflphone-common/libs/pjproject/pjnath/src/pjnath-test/stun.c
index bfda94244edffe0c47701aa00b7331a56751b5c7..974faab0149c8b11ffa26e5c0cf5a2fb5f38254b 100644
--- a/sflphone-common/libs/pjproject/pjnath/src/pjnath-test/stun.c
+++ b/sflphone-common/libs/pjproject/pjnath/src/pjnath-test/stun.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include "test.h"
diff --git a/sflphone-common/libs/pjproject/pjnath/src/pjnath-test/stun_sock_test.c b/sflphone-common/libs/pjproject/pjnath/src/pjnath-test/stun_sock_test.c
index 1a047fac63a8abe66c8aa03e113c4acfa7eb68f5..08ad3911010c4e7e7aa0e564b556943f459784b2 100644
--- a/sflphone-common/libs/pjproject/pjnath/src/pjnath-test/stun_sock_test.c
+++ b/sflphone-common/libs/pjproject/pjnath/src/pjnath-test/stun_sock_test.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include "test.h"
diff --git a/sflphone-common/libs/pjproject/pjnath/src/pjnath-test/test.c b/sflphone-common/libs/pjproject/pjnath/src/pjnath-test/test.c
index cfc3548d256badc2739daa8225f82cde14f8b037..8b64e064fea996ab68a66a2d3bc96d4de62483a0 100644
--- a/sflphone-common/libs/pjproject/pjnath/src/pjnath-test/test.c
+++ b/sflphone-common/libs/pjproject/pjnath/src/pjnath-test/test.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include "test.h"
#include <pjlib.h>
diff --git a/sflphone-common/libs/pjproject/pjnath/src/pjnath-test/test.h b/sflphone-common/libs/pjproject/pjnath/src/pjnath-test/test.h
index db91b67753f2e9606a2d24b64d11a83fc66fa80d..1a3c9e01cc23898bf810da1fb57472101c5c706b 100644
--- a/sflphone-common/libs/pjproject/pjnath/src/pjnath-test/test.h
+++ b/sflphone-common/libs/pjproject/pjnath/src/pjnath-test/test.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pjlib.h>
#include <pjlib-util.h>
diff --git a/sflphone-common/libs/pjproject/pjnath/src/pjnath-test/turn_sock_test.c b/sflphone-common/libs/pjproject/pjnath/src/pjnath-test/turn_sock_test.c
index f89a4f4b03c26f77c2efa66aea373251fa340547..725d52904859c4b377fa1375d06f1c8e41f3ac9a 100644
--- a/sflphone-common/libs/pjproject/pjnath/src/pjnath-test/turn_sock_test.c
+++ b/sflphone-common/libs/pjproject/pjnath/src/pjnath-test/turn_sock_test.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include "test.h"
#include "server.h"
diff --git a/sflphone-common/libs/pjproject/pjnath/src/pjnath/errno.c b/sflphone-common/libs/pjproject/pjnath/src/pjnath/errno.c
index fcc5e36172e2f7a4f165aa3bd7e796e450bad3ed..6ba3eb8ae1069584ae2b5b9be93583658e85fae0 100644
--- a/sflphone-common/libs/pjproject/pjnath/src/pjnath/errno.c
+++ b/sflphone-common/libs/pjproject/pjnath/src/pjnath/errno.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pjnath/errno.h>
#include <pjnath/stun_msg.h>
diff --git a/sflphone-common/libs/pjproject/pjnath/src/pjnath/ice_session.c b/sflphone-common/libs/pjproject/pjnath/src/pjnath/ice_session.c
index 3a7727d0c9f92f1d28ad44f070ac100f03930564..1307ce9fcef007c8dfd7c0ef735d85cdca7ac93c 100644
--- a/sflphone-common/libs/pjproject/pjnath/src/pjnath/ice_session.c
+++ b/sflphone-common/libs/pjproject/pjnath/src/pjnath/ice_session.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pjnath/ice_session.h>
#include <pj/addr_resolv.h>
diff --git a/sflphone-common/libs/pjproject/pjnath/src/pjnath/ice_strans.c b/sflphone-common/libs/pjproject/pjnath/src/pjnath/ice_strans.c
index fa6c067b9a0a418d0f0cb3cc4496a063b46cf707..23430e9df1ac4bff5a1cd5c9d515e2c5cb6aa1e0 100644
--- a/sflphone-common/libs/pjproject/pjnath/src/pjnath/ice_strans.c
+++ b/sflphone-common/libs/pjproject/pjnath/src/pjnath/ice_strans.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pjnath/ice_strans.h>
#include <pjnath/errno.h>
diff --git a/sflphone-common/libs/pjproject/pjnath/src/pjnath/nat_detect.c b/sflphone-common/libs/pjproject/pjnath/src/pjnath/nat_detect.c
index bee2ffeaec1a063f373c4c6f03cdedc9d06ea4da..ee7df8314cb552afc04b7c5fee281b18c0835ef1 100644
--- a/sflphone-common/libs/pjproject/pjnath/src/pjnath/nat_detect.c
+++ b/sflphone-common/libs/pjproject/pjnath/src/pjnath/nat_detect.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pjnath/nat_detect.h>
#include <pjnath/errno.h>
diff --git a/sflphone-common/libs/pjproject/pjnath/src/pjnath/stun_auth.c b/sflphone-common/libs/pjproject/pjnath/src/pjnath/stun_auth.c
index 0661c9ac50bed5de0dc8b2f7b697a552d2c40c48..e1e58ad9ecf7553d37e221c347fb912367def1e9 100644
--- a/sflphone-common/libs/pjproject/pjnath/src/pjnath/stun_auth.c
+++ b/sflphone-common/libs/pjproject/pjnath/src/pjnath/stun_auth.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pjnath/stun_auth.h>
#include <pjnath/errno.h>
diff --git a/sflphone-common/libs/pjproject/pjnath/src/pjnath/stun_msg.c b/sflphone-common/libs/pjproject/pjnath/src/pjnath/stun_msg.c
index a90b0aeb9859ba848d35a0199ee86c7f7ee5301d..8b31344f8bb120a842e31499f575da416368c359 100644
--- a/sflphone-common/libs/pjproject/pjnath/src/pjnath/stun_msg.c
+++ b/sflphone-common/libs/pjproject/pjnath/src/pjnath/stun_msg.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pjnath/stun_msg.h>
#include <pjnath/errno.h>
diff --git a/sflphone-common/libs/pjproject/pjnath/src/pjnath/stun_msg_dump.c b/sflphone-common/libs/pjproject/pjnath/src/pjnath/stun_msg_dump.c
index 5911ae4f6e8d586873021165744b2c73f02fe3ce..576c42271db04e4cbae0bc8fa8b4fb5c3a9bb4e0 100644
--- a/sflphone-common/libs/pjproject/pjnath/src/pjnath/stun_msg_dump.c
+++ b/sflphone-common/libs/pjproject/pjnath/src/pjnath/stun_msg_dump.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pjnath/stun_msg.h>
#include <pjnath/errno.h>
diff --git a/sflphone-common/libs/pjproject/pjnath/src/pjnath/stun_session.c b/sflphone-common/libs/pjproject/pjnath/src/pjnath/stun_session.c
index 5b149d5834ca51ea912bcce183716bc1a4a708d7..8a82891900373998e5516b459e3231ec8d22da73 100644
--- a/sflphone-common/libs/pjproject/pjnath/src/pjnath/stun_session.c
+++ b/sflphone-common/libs/pjproject/pjnath/src/pjnath/stun_session.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pjnath/stun_session.h>
#include <pjnath/errno.h>
diff --git a/sflphone-common/libs/pjproject/pjnath/src/pjnath/stun_sock.c b/sflphone-common/libs/pjproject/pjnath/src/pjnath/stun_sock.c
index 2ba37f82e0fbd7cbebda7e359a2f88f18d2a8405..d75b7f7502ffd19ffc5187298f17743e8bde33f3 100644
--- a/sflphone-common/libs/pjproject/pjnath/src/pjnath/stun_sock.c
+++ b/sflphone-common/libs/pjproject/pjnath/src/pjnath/stun_sock.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pjnath/stun_sock.h>
#include <pjnath/errno.h>
diff --git a/sflphone-common/libs/pjproject/pjnath/src/pjnath/stun_transaction.c b/sflphone-common/libs/pjproject/pjnath/src/pjnath/stun_transaction.c
index ab85692f4e9241f786d9c9c6e436585b00c87f28..7668926e1e4b9a1c6b0a26f57fa2ff5f249c1ea4 100644
--- a/sflphone-common/libs/pjproject/pjnath/src/pjnath/stun_transaction.c
+++ b/sflphone-common/libs/pjproject/pjnath/src/pjnath/stun_transaction.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pjnath/stun_transaction.h>
#include <pjnath/errno.h>
diff --git a/sflphone-common/libs/pjproject/pjnath/src/pjnath/turn_session.c b/sflphone-common/libs/pjproject/pjnath/src/pjnath/turn_session.c
index 98a7371cd49c58e1684265a0622acbc1dbc17b9e..1b5a6de35f3dc727abeb7d55c1ab304e61ae14ae 100644
--- a/sflphone-common/libs/pjproject/pjnath/src/pjnath/turn_session.c
+++ b/sflphone-common/libs/pjproject/pjnath/src/pjnath/turn_session.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pjnath/turn_session.h>
#include <pjnath/errno.h>
diff --git a/sflphone-common/libs/pjproject/pjnath/src/pjnath/turn_sock.c b/sflphone-common/libs/pjproject/pjnath/src/pjnath/turn_sock.c
index 70acf7481d775b095974ec2efec89bda68c38108..f76bad79512a6ac4953ba1dcc7d2a8ad6128c6af 100644
--- a/sflphone-common/libs/pjproject/pjnath/src/pjnath/turn_sock.c
+++ b/sflphone-common/libs/pjproject/pjnath/src/pjnath/turn_sock.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pjnath/turn_sock.h>
#include <pj/activesock.h>
diff --git a/sflphone-common/libs/pjproject/pjnath/src/pjturn-client/client_main.c b/sflphone-common/libs/pjproject/pjnath/src/pjturn-client/client_main.c
index 7c6239cc2206d6cc5a3365d1c7efbf165f91ba1a..7a834e50d6e56012af041d8ea27b1b0b4f979248 100644
--- a/sflphone-common/libs/pjproject/pjnath/src/pjturn-client/client_main.c
+++ b/sflphone-common/libs/pjproject/pjnath/src/pjturn-client/client_main.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pjnath.h>
#include <pjlib-util.h>
diff --git a/sflphone-common/libs/pjproject/pjnath/src/pjturn-srv/allocation.c b/sflphone-common/libs/pjproject/pjnath/src/pjturn-srv/allocation.c
index 57a0ce0201b12fc5a2235e42a6216df6d6377a6a..435966b159553c6e2270df4ddf0c49647aca0d29 100644
--- a/sflphone-common/libs/pjproject/pjnath/src/pjturn-srv/allocation.c
+++ b/sflphone-common/libs/pjproject/pjnath/src/pjturn-srv/allocation.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include "turn.h"
#include "auth.h"
diff --git a/sflphone-common/libs/pjproject/pjnath/src/pjturn-srv/auth.c b/sflphone-common/libs/pjproject/pjnath/src/pjturn-srv/auth.c
index 286772ce0c32a9d22243623a1333166f7530a4f4..fa2cad67ca6bed7242cc16208fd735583046580f 100644
--- a/sflphone-common/libs/pjproject/pjnath/src/pjturn-srv/auth.c
+++ b/sflphone-common/libs/pjproject/pjnath/src/pjturn-srv/auth.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include "auth.h"
#include <pjlib.h>
diff --git a/sflphone-common/libs/pjproject/pjnath/src/pjturn-srv/auth.h b/sflphone-common/libs/pjproject/pjnath/src/pjturn-srv/auth.h
index 13416cfb79fc38a14200d58cad98a7e72b52d9b1..a4cc1a194040e4513f13ed42a40ea4fad2caf11f 100644
--- a/sflphone-common/libs/pjproject/pjnath/src/pjturn-srv/auth.h
+++ b/sflphone-common/libs/pjproject/pjnath/src/pjturn-srv/auth.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJ_TURN_SRV_AUTH_H__
#define __PJ_TURN_SRV_AUTH_H__
diff --git a/sflphone-common/libs/pjproject/pjnath/src/pjturn-srv/listener_tcp.c b/sflphone-common/libs/pjproject/pjnath/src/pjturn-srv/listener_tcp.c
index 20015a5ad4f9da8b4d28270cfd46e7e78607e98d..2430ef8e415ec10674ba2c12dab52dfdcfeffd48 100644
--- a/sflphone-common/libs/pjproject/pjnath/src/pjturn-srv/listener_tcp.c
+++ b/sflphone-common/libs/pjproject/pjnath/src/pjturn-srv/listener_tcp.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include "turn.h"
#include <pj/compat/socket.h>
diff --git a/sflphone-common/libs/pjproject/pjnath/src/pjturn-srv/listener_udp.c b/sflphone-common/libs/pjproject/pjnath/src/pjturn-srv/listener_udp.c
index 89d6321073dbf03da92bdc406b8438c76acebd1d..d5344c754f3e62efe0be44b8ebede11d54d1a49d 100644
--- a/sflphone-common/libs/pjproject/pjnath/src/pjturn-srv/listener_udp.c
+++ b/sflphone-common/libs/pjproject/pjnath/src/pjturn-srv/listener_udp.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include "turn.h"
#include <pj/compat/socket.h>
diff --git a/sflphone-common/libs/pjproject/pjnath/src/pjturn-srv/main.c b/sflphone-common/libs/pjproject/pjnath/src/pjturn-srv/main.c
index 095745363198f24ad0b90143d6771c3c5d5b07dd..a7bb60bf62051dbcab583e19c553d78ef0912c00 100644
--- a/sflphone-common/libs/pjproject/pjnath/src/pjturn-srv/main.c
+++ b/sflphone-common/libs/pjproject/pjnath/src/pjturn-srv/main.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include "turn.h"
#include "auth.h"
diff --git a/sflphone-common/libs/pjproject/pjnath/src/pjturn-srv/server.c b/sflphone-common/libs/pjproject/pjnath/src/pjturn-srv/server.c
index 5a6d62cc515f6837e0469303d5fe41e84aa74578..83bd3d59638664be3dd07aad7647e925a7641b0a 100644
--- a/sflphone-common/libs/pjproject/pjnath/src/pjturn-srv/server.c
+++ b/sflphone-common/libs/pjproject/pjnath/src/pjturn-srv/server.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include "turn.h"
#include "auth.h"
diff --git a/sflphone-common/libs/pjproject/pjnath/src/pjturn-srv/turn.h b/sflphone-common/libs/pjproject/pjnath/src/pjturn-srv/turn.h
index c4e021bd028f97161db3972bd6683093b988c4d8..2d8a7a50b8ff4e616773503baf9a359d4cd1724f 100644
--- a/sflphone-common/libs/pjproject/pjnath/src/pjturn-srv/turn.h
+++ b/sflphone-common/libs/pjproject/pjnath/src/pjturn-srv/turn.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJ_TURN_SRV_TURN_H__
#define __PJ_TURN_SRV_TURN_H__
diff --git a/sflphone-common/libs/pjproject/pjsip/include/pjsip-simple/errno.h b/sflphone-common/libs/pjproject/pjsip/include/pjsip-simple/errno.h
index e716ad40a88e3440382122dbe677741f05d6c99a..b80343260d9a983216c68f0af194d9f1dcc35a2b 100644
--- a/sflphone-common/libs/pjproject/pjsip/include/pjsip-simple/errno.h
+++ b/sflphone-common/libs/pjproject/pjsip/include/pjsip-simple/errno.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJSIP_SIMPLE_ERRNO_H__
#define __PJSIP_SIMPLE_ERRNO_H__
diff --git a/sflphone-common/libs/pjproject/pjsip/include/pjsip-simple/evsub.h b/sflphone-common/libs/pjproject/pjsip/include/pjsip-simple/evsub.h
index d01c71d7e079117e76a16cc540699be12aede816..0136be1d165a0a0534fb2b5bedef5ea3ed7fcd4f 100644
--- a/sflphone-common/libs/pjproject/pjsip/include/pjsip-simple/evsub.h
+++ b/sflphone-common/libs/pjproject/pjsip/include/pjsip-simple/evsub.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJSIP_SIMPLE_EVSUB_H__
#define __PJSIP_SIMPLE_EVSUB_H__
diff --git a/sflphone-common/libs/pjproject/pjsip/include/pjsip-simple/evsub_msg.h b/sflphone-common/libs/pjproject/pjsip/include/pjsip-simple/evsub_msg.h
index 32211db7954ea59cd3dc4cb58d65a6b7199c8396..dd8f70e8706174d78ec6a28bce302f9e477d8236 100644
--- a/sflphone-common/libs/pjproject/pjsip/include/pjsip-simple/evsub_msg.h
+++ b/sflphone-common/libs/pjproject/pjsip/include/pjsip-simple/evsub_msg.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJSIP_SIMPLE_EVENT_NOTIFY_MSG_H__
#define __PJSIP_SIMPLE_EVENT_NOTIFY_MSG_H__
diff --git a/sflphone-common/libs/pjproject/pjsip/include/pjsip-simple/iscomposing.h b/sflphone-common/libs/pjproject/pjsip/include/pjsip-simple/iscomposing.h
index c0635b63556650f0ba19cf38c657222e013bb92d..51846b3520c26167753951c4888a7e49bafe9edd 100644
--- a/sflphone-common/libs/pjproject/pjsip/include/pjsip-simple/iscomposing.h
+++ b/sflphone-common/libs/pjproject/pjsip/include/pjsip-simple/iscomposing.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJSIP_SIMPLE_ISCOMPOSING_H__
#define __PJSIP_SIMPLE_ISCOMPOSING_H__
diff --git a/sflphone-common/libs/pjproject/pjsip/include/pjsip-simple/mwi.h b/sflphone-common/libs/pjproject/pjsip/include/pjsip-simple/mwi.h
index 351bbbea4fed96cb272f7c376ed72c4adaaacd02..e1858e2096dd0364eee0520d004a653bf7a0a197 100644
--- a/sflphone-common/libs/pjproject/pjsip/include/pjsip-simple/mwi.h
+++ b/sflphone-common/libs/pjproject/pjsip/include/pjsip-simple/mwi.h
@@ -15,6 +15,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJSIP_SIMPLE_MWI_H__
#define __PJSIP_SIMPLE_MWI_H__
diff --git a/sflphone-common/libs/pjproject/pjsip/include/pjsip-simple/pidf.h b/sflphone-common/libs/pjproject/pjsip/include/pjsip-simple/pidf.h
index 44d0c24d3a84e57b7ef2aa1f39ac392f371613cb..8744e3cbe916ee3826187c43509be0f5e5f617fe 100644
--- a/sflphone-common/libs/pjproject/pjsip/include/pjsip-simple/pidf.h
+++ b/sflphone-common/libs/pjproject/pjsip/include/pjsip-simple/pidf.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJSIP_SIMPLE_PIDF_H__
#define __PJSIP_SIMPLE_PIDF_H__
diff --git a/sflphone-common/libs/pjproject/pjsip/include/pjsip-simple/presence.h b/sflphone-common/libs/pjproject/pjsip/include/pjsip-simple/presence.h
index aed680b6b9ca540fe0b0cda3a843698cf280d7ff..b989ebc192492d5acf730e3e47929db86ec473ad 100644
--- a/sflphone-common/libs/pjproject/pjsip/include/pjsip-simple/presence.h
+++ b/sflphone-common/libs/pjproject/pjsip/include/pjsip-simple/presence.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJSIP_SIMPLE_PRESENCE_H__
#define __PJSIP_SIMPLE_PRESENCE_H__
diff --git a/sflphone-common/libs/pjproject/pjsip/include/pjsip-simple/publish.h b/sflphone-common/libs/pjproject/pjsip/include/pjsip-simple/publish.h
index 36147c4b0f9f8a145d9972cf24625e769e320d46..7927a32e1bea8abfa9af8040e01bc5baba0d7cba 100644
--- a/sflphone-common/libs/pjproject/pjsip/include/pjsip-simple/publish.h
+++ b/sflphone-common/libs/pjproject/pjsip/include/pjsip-simple/publish.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJSIP_SIMPLE_PUBLISH_H__
#define __PJSIP_SIMPLE_PUBLISH_H__
diff --git a/sflphone-common/libs/pjproject/pjsip/include/pjsip-simple/rpid.h b/sflphone-common/libs/pjproject/pjsip/include/pjsip-simple/rpid.h
index fb13ef90a0b94d9497f8de565c832a954022ba20..328f51b4877e7824b4f724c8fea930696fe4195e 100644
--- a/sflphone-common/libs/pjproject/pjsip/include/pjsip-simple/rpid.h
+++ b/sflphone-common/libs/pjproject/pjsip/include/pjsip-simple/rpid.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJSIP_SIMPLE_RPID_H__
#define __PJSIP_SIMPLE_RPID_H__
diff --git a/sflphone-common/libs/pjproject/pjsip/include/pjsip-simple/types.h b/sflphone-common/libs/pjproject/pjsip/include/pjsip-simple/types.h
index fec50a5f37a699cb91e3cd0b73a1582efa5ab422..84b5a8487c7837cd97b2eed266feefc421df3655 100644
--- a/sflphone-common/libs/pjproject/pjsip/include/pjsip-simple/types.h
+++ b/sflphone-common/libs/pjproject/pjsip/include/pjsip-simple/types.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJSIP_SIMPLE_TYPES_H__
#define __PJSIP_SIMPLE_TYPES_H__
diff --git a/sflphone-common/libs/pjproject/pjsip/include/pjsip-simple/xpidf.h b/sflphone-common/libs/pjproject/pjsip/include/pjsip-simple/xpidf.h
index d56ccf3fa0e0f74b9141396e8d8dede91f1b3686..ecb7ef33a16d9d31b5e42a284a96a1c6d05f7fce 100644
--- a/sflphone-common/libs/pjproject/pjsip/include/pjsip-simple/xpidf.h
+++ b/sflphone-common/libs/pjproject/pjsip/include/pjsip-simple/xpidf.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJSIP_SIMPLE_XPIDF_H__
#define __PJSIP_SIMPLE_XPIDF_H__
diff --git a/sflphone-common/libs/pjproject/pjsip/include/pjsip-ua/sip_100rel.h b/sflphone-common/libs/pjproject/pjsip/include/pjsip-ua/sip_100rel.h
index 4f909856084cd8bfb242f9f0aad24b7a5b7096e1..c90bbaf38f956c50306fa42aee540e53a2043155 100644
--- a/sflphone-common/libs/pjproject/pjsip/include/pjsip-ua/sip_100rel.h
+++ b/sflphone-common/libs/pjproject/pjsip/include/pjsip-ua/sip_100rel.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __SIP_100REL_H__
#define __SIP_100REL_H__
diff --git a/sflphone-common/libs/pjproject/pjsip/include/pjsip-ua/sip_inv.h b/sflphone-common/libs/pjproject/pjsip/include/pjsip-ua/sip_inv.h
index e335ab623a35198f6768ae6cb73f44f628bf15b7..26507caebcb4e4e6645176c4410cd84b28be422e 100644
--- a/sflphone-common/libs/pjproject/pjsip/include/pjsip-ua/sip_inv.h
+++ b/sflphone-common/libs/pjproject/pjsip/include/pjsip-ua/sip_inv.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __SIP_INVITE_SESSION_H__
#define __SIP_INVITE_SESSION_H__
diff --git a/sflphone-common/libs/pjproject/pjsip/include/pjsip-ua/sip_regc.h b/sflphone-common/libs/pjproject/pjsip/include/pjsip-ua/sip_regc.h
index 330845b5ed536b1d0c9fcae917ab0c21925b501d..01a2ff51fb464388b2932228a4f66b06da4e6aa0 100644
--- a/sflphone-common/libs/pjproject/pjsip/include/pjsip-ua/sip_regc.h
+++ b/sflphone-common/libs/pjproject/pjsip/include/pjsip-ua/sip_regc.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJSIP_SIP_REG_H__
#define __PJSIP_SIP_REG_H__
diff --git a/sflphone-common/libs/pjproject/pjsip/include/pjsip-ua/sip_replaces.h b/sflphone-common/libs/pjproject/pjsip/include/pjsip-ua/sip_replaces.h
index 582650c71396e66dc0e36e0470b55fd2096b7ecd..1ca5dce7f4636544615388e8f7db9cd3fc0e6267 100644
--- a/sflphone-common/libs/pjproject/pjsip/include/pjsip-ua/sip_replaces.h
+++ b/sflphone-common/libs/pjproject/pjsip/include/pjsip-ua/sip_replaces.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJSIP_REPLACES_H__
#define __PJSIP_REPLACES_H__
diff --git a/sflphone-common/libs/pjproject/pjsip/include/pjsip-ua/sip_timer.h b/sflphone-common/libs/pjproject/pjsip/include/pjsip-ua/sip_timer.h
index fae97dd722312e46626889871209a0f485dc51de..1a0bc5003bd0e3e3ef7e936cf6567011c8cba4a6 100644
--- a/sflphone-common/libs/pjproject/pjsip/include/pjsip-ua/sip_timer.h
+++ b/sflphone-common/libs/pjproject/pjsip/include/pjsip-ua/sip_timer.h
@@ -15,6 +15,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJSIP_TIMER_H__
#define __PJSIP_TIMER_H__
diff --git a/sflphone-common/libs/pjproject/pjsip/include/pjsip-ua/sip_xfer.h b/sflphone-common/libs/pjproject/pjsip/include/pjsip-ua/sip_xfer.h
index f816406f120d0285667973174d3b83a2d1ee0a70..ca487aa2329ae879fa0c28fde4a119d6c30b15c7 100644
--- a/sflphone-common/libs/pjproject/pjsip/include/pjsip-ua/sip_xfer.h
+++ b/sflphone-common/libs/pjproject/pjsip/include/pjsip-ua/sip_xfer.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJSIP_XFER_H__
#define __PJSIP_XFER_H__
diff --git a/sflphone-common/libs/pjproject/pjsip/include/pjsip.h b/sflphone-common/libs/pjproject/pjsip/include/pjsip.h
index b5ebb7301ed7fad74fb0c3a157411f6069bf4cfb..a9216b479eafba69e43a5da02326ec46aa92d974 100644
--- a/sflphone-common/libs/pjproject/pjsip/include/pjsip.h
+++ b/sflphone-common/libs/pjproject/pjsip/include/pjsip.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJSIP_H__
#define __PJSIP_H__
diff --git a/sflphone-common/libs/pjproject/pjsip/include/pjsip/print_util.h b/sflphone-common/libs/pjproject/pjsip/include/pjsip/print_util.h
index 686bc9e5d36194f3b8e34be62493644c12dee3d8..525ca2d3dab48f61ba78eade475b73832b5b6c11 100644
--- a/sflphone-common/libs/pjproject/pjsip/include/pjsip/print_util.h
+++ b/sflphone-common/libs/pjproject/pjsip/include/pjsip/print_util.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJSIP_PRINT_H__
#define __PJSIP_PRINT_H__
diff --git a/sflphone-common/libs/pjproject/pjsip/include/pjsip/sip_auth.h b/sflphone-common/libs/pjproject/pjsip/include/pjsip/sip_auth.h
index cd00d3d6216af9f2b9aa81b9322ecf08ba3f40c2..0f81d487c9a97426b7ec19bee1e915e914e75def 100644
--- a/sflphone-common/libs/pjproject/pjsip/include/pjsip/sip_auth.h
+++ b/sflphone-common/libs/pjproject/pjsip/include/pjsip/sip_auth.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJSIP_AUTH_SIP_AUTH_H__
#define __PJSIP_AUTH_SIP_AUTH_H__
diff --git a/sflphone-common/libs/pjproject/pjsip/include/pjsip/sip_auth_aka.h b/sflphone-common/libs/pjproject/pjsip/include/pjsip/sip_auth_aka.h
index 0f36beceddf5eb02c700a6dcaef9acb0592dcb29..ceaa735067a25270f8ada396e3de1b35d0d6a0da 100644
--- a/sflphone-common/libs/pjproject/pjsip/include/pjsip/sip_auth_aka.h
+++ b/sflphone-common/libs/pjproject/pjsip/include/pjsip/sip_auth_aka.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJSIP_AUTH_SIP_AUTH_AKA_H__
#define __PJSIP_AUTH_SIP_AUTH_AKA_H__
diff --git a/sflphone-common/libs/pjproject/pjsip/include/pjsip/sip_auth_msg.h b/sflphone-common/libs/pjproject/pjsip/include/pjsip/sip_auth_msg.h
index 473a231cd3ed5d83d7512eb9d40e14de24a497be..b4c92e461bcb4a8bf562dfae48b63b947a1a6b13 100644
--- a/sflphone-common/libs/pjproject/pjsip/include/pjsip/sip_auth_msg.h
+++ b/sflphone-common/libs/pjproject/pjsip/include/pjsip/sip_auth_msg.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJSIP_AUTH_SIP_AUTH_MSG_H__
#define __PJSIP_AUTH_SIP_AUTH_MSG_H__
diff --git a/sflphone-common/libs/pjproject/pjsip/include/pjsip/sip_auth_parser.h b/sflphone-common/libs/pjproject/pjsip/include/pjsip/sip_auth_parser.h
index 64596f34fd65b4efe2eea6be94768da06d096954..078181537a0801c2083cfdca8d8d5d82afa1930e 100644
--- a/sflphone-common/libs/pjproject/pjsip/include/pjsip/sip_auth_parser.h
+++ b/sflphone-common/libs/pjproject/pjsip/include/pjsip/sip_auth_parser.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJSIP_AUTH_SIP_AUTH_PARSER_H__
#define __PJSIP_AUTH_SIP_AUTH_PARSER_H__
diff --git a/sflphone-common/libs/pjproject/pjsip/include/pjsip/sip_autoconf.h.in b/sflphone-common/libs/pjproject/pjsip/include/pjsip/sip_autoconf.h.in
index 2b9a6d0ca9055ac972c07c8adfce1d4072c7cef9..8939ace06058af0ea6a476fa463fa37bd9ff596a 100644
--- a/sflphone-common/libs/pjproject/pjsip/include/pjsip/sip_autoconf.h.in
+++ b/sflphone-common/libs/pjproject/pjsip/include/pjsip/sip_autoconf.h.in
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJSIP_SIP_AUTOCONF_H__
#define __PJSIP_SIP_AUTOCONF_H__
diff --git a/sflphone-common/libs/pjproject/pjsip/include/pjsip/sip_config.h b/sflphone-common/libs/pjproject/pjsip/include/pjsip/sip_config.h
index 0250fb8e96556a96a658e2596950444102aa70f0..77ad5d35e43afbcad27347a16a74885e65edbf18 100644
--- a/sflphone-common/libs/pjproject/pjsip/include/pjsip/sip_config.h
+++ b/sflphone-common/libs/pjproject/pjsip/include/pjsip/sip_config.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJSIP_SIP_CONFIG_H__
#define __PJSIP_SIP_CONFIG_H__
diff --git a/sflphone-common/libs/pjproject/pjsip/include/pjsip/sip_dialog.h b/sflphone-common/libs/pjproject/pjsip/include/pjsip/sip_dialog.h
index 54cfb79722f8dc3a5b3d4f074765dec76a4a1ea9..63171833edff9544ee9393b292eb85373d8024c6 100644
--- a/sflphone-common/libs/pjproject/pjsip/include/pjsip/sip_dialog.h
+++ b/sflphone-common/libs/pjproject/pjsip/include/pjsip/sip_dialog.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJSIP_SIP_DIALOG_H__
#define __PJSIP_SIP_DIALOG_H__
diff --git a/sflphone-common/libs/pjproject/pjsip/include/pjsip/sip_endpoint.h b/sflphone-common/libs/pjproject/pjsip/include/pjsip/sip_endpoint.h
index a2bd412df6cf7166ee2844c78cab3cc6568131f2..cd01af4f29b1ae1f1cdc2d70aa279fd982385c60 100644
--- a/sflphone-common/libs/pjproject/pjsip/include/pjsip/sip_endpoint.h
+++ b/sflphone-common/libs/pjproject/pjsip/include/pjsip/sip_endpoint.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJSIP_SIP_ENDPOINT_H__
#define __PJSIP_SIP_ENDPOINT_H__
diff --git a/sflphone-common/libs/pjproject/pjsip/include/pjsip/sip_errno.h b/sflphone-common/libs/pjproject/pjsip/include/pjsip/sip_errno.h
index 2cd10b2a907205ebc278b3701483582528d1f678..0467cb2971889ff15cd07cb3c1c5e9c1ef6b67de 100644
--- a/sflphone-common/libs/pjproject/pjsip/include/pjsip/sip_errno.h
+++ b/sflphone-common/libs/pjproject/pjsip/include/pjsip/sip_errno.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJSIP_SIP_ERRNO_H__
#define __PJSIP_SIP_ERRNO_H__
diff --git a/sflphone-common/libs/pjproject/pjsip/include/pjsip/sip_event.h b/sflphone-common/libs/pjproject/pjsip/include/pjsip/sip_event.h
index 135a11d93f5fe44f83271926b37022550daeec05..58a18f8bbc24788d57488bc13a41af12ea96ef73 100644
--- a/sflphone-common/libs/pjproject/pjsip/include/pjsip/sip_event.h
+++ b/sflphone-common/libs/pjproject/pjsip/include/pjsip/sip_event.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJSIP_SIP_EVENT_H__
#define __PJSIP_SIP_EVENT_H__
diff --git a/sflphone-common/libs/pjproject/pjsip/include/pjsip/sip_module.h b/sflphone-common/libs/pjproject/pjsip/include/pjsip/sip_module.h
index 81361fbd2d55e0d1fb246b72a1cfdbc318569517..83da753abdd3129aa4716abd50d3edef4604b049 100644
--- a/sflphone-common/libs/pjproject/pjsip/include/pjsip/sip_module.h
+++ b/sflphone-common/libs/pjproject/pjsip/include/pjsip/sip_module.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJSIP_SIP_MODULE_H__
#define __PJSIP_SIP_MODULE_H__
diff --git a/sflphone-common/libs/pjproject/pjsip/include/pjsip/sip_msg.h b/sflphone-common/libs/pjproject/pjsip/include/pjsip/sip_msg.h
index 51e970c0dac4d51c3d0ff460f5793c957a162f11..69650aa2011731b309363968c1c9d727534a6d7a 100644
--- a/sflphone-common/libs/pjproject/pjsip/include/pjsip/sip_msg.h
+++ b/sflphone-common/libs/pjproject/pjsip/include/pjsip/sip_msg.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJSIP_SIP_MSG_H__
#define __PJSIP_SIP_MSG_H__
diff --git a/sflphone-common/libs/pjproject/pjsip/include/pjsip/sip_parser.h b/sflphone-common/libs/pjproject/pjsip/include/pjsip/sip_parser.h
index d3cb84a3f4767fcc49bc5b38c3624a614e406b31..68594ebd9962008652823e657cb8772238d2b01b 100644
--- a/sflphone-common/libs/pjproject/pjsip/include/pjsip/sip_parser.h
+++ b/sflphone-common/libs/pjproject/pjsip/include/pjsip/sip_parser.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJSIP_SIP_PARSER_H__
#define __PJSIP_SIP_PARSER_H__
diff --git a/sflphone-common/libs/pjproject/pjsip/include/pjsip/sip_private.h b/sflphone-common/libs/pjproject/pjsip/include/pjsip/sip_private.h
index 6a5bb0b88091e8669bc563cea7554cf7f42e6a20..f2eb5990b4446703360a5b0f7471bbc3d5b82f47 100644
--- a/sflphone-common/libs/pjproject/pjsip/include/pjsip/sip_private.h
+++ b/sflphone-common/libs/pjproject/pjsip/include/pjsip/sip_private.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJSIP_SIP_PRIVATE_H__
#define __PJSIP_SIP_PRIVATE_H__
diff --git a/sflphone-common/libs/pjproject/pjsip/include/pjsip/sip_resolve.h b/sflphone-common/libs/pjproject/pjsip/include/pjsip/sip_resolve.h
index 4eaf2d4a6e321cdc7c973eadf92abb8f3b2c42c2..6f6b68c01ed94c75f6ee3cbda1fe8dcc1339c99a 100644
--- a/sflphone-common/libs/pjproject/pjsip/include/pjsip/sip_resolve.h
+++ b/sflphone-common/libs/pjproject/pjsip/include/pjsip/sip_resolve.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJSIP_SIP_RESOLVE_H__
#define __PJSIP_SIP_RESOLVE_H__
diff --git a/sflphone-common/libs/pjproject/pjsip/include/pjsip/sip_tel_uri.h b/sflphone-common/libs/pjproject/pjsip/include/pjsip/sip_tel_uri.h
index 98e2f8bbb800f4339748ae02c6ad8fbb7b92160a..f72f03c88244a709eb366d71b94844ae8e566f5f 100644
--- a/sflphone-common/libs/pjproject/pjsip/include/pjsip/sip_tel_uri.h
+++ b/sflphone-common/libs/pjproject/pjsip/include/pjsip/sip_tel_uri.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJSIP_TEL_URI_H__
#define __PJSIP_TEL_URI_H__
diff --git a/sflphone-common/libs/pjproject/pjsip/include/pjsip/sip_transaction.h b/sflphone-common/libs/pjproject/pjsip/include/pjsip/sip_transaction.h
index bc6c66deee0c039f6a175c3399b3fa5a14d4c4eb..966326926812126fe716239740313eac02e7e198 100644
--- a/sflphone-common/libs/pjproject/pjsip/include/pjsip/sip_transaction.h
+++ b/sflphone-common/libs/pjproject/pjsip/include/pjsip/sip_transaction.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJSIP_SIP_TRANSACTION_H__
#define __PJSIP_SIP_TRANSACTION_H__
diff --git a/sflphone-common/libs/pjproject/pjsip/include/pjsip/sip_transport.h b/sflphone-common/libs/pjproject/pjsip/include/pjsip/sip_transport.h
index ed52cf670d65e13ec45a737354e2d86a227556ea..b67647590452d5f8dc8bcb10ce16f8647851fcae 100644
--- a/sflphone-common/libs/pjproject/pjsip/include/pjsip/sip_transport.h
+++ b/sflphone-common/libs/pjproject/pjsip/include/pjsip/sip_transport.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJSIP_SIP_TRANSPORT_H__
#define __PJSIP_SIP_TRANSPORT_H__
diff --git a/sflphone-common/libs/pjproject/pjsip/include/pjsip/sip_transport_loop.h b/sflphone-common/libs/pjproject/pjsip/include/pjsip/sip_transport_loop.h
index 534ba231247f016e3f6dc62e6600f73653c44220..4a10e3f4dbbf1423bd5fbcd7a1fc00574127d496 100644
--- a/sflphone-common/libs/pjproject/pjsip/include/pjsip/sip_transport_loop.h
+++ b/sflphone-common/libs/pjproject/pjsip/include/pjsip/sip_transport_loop.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJSIP_TRANSPORT_LOOP_H__
#define __PJSIP_TRANSPORT_LOOP_H__
diff --git a/sflphone-common/libs/pjproject/pjsip/include/pjsip/sip_transport_tcp.h b/sflphone-common/libs/pjproject/pjsip/include/pjsip/sip_transport_tcp.h
index d2fc6536262cdc1696bd9fd3619a32becf1988fb..acca0490b5de1635b74c14339d433088923118fd 100644
--- a/sflphone-common/libs/pjproject/pjsip/include/pjsip/sip_transport_tcp.h
+++ b/sflphone-common/libs/pjproject/pjsip/include/pjsip/sip_transport_tcp.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJSIP_TRANSPORT_TCP_H__
#define __PJSIP_TRANSPORT_TCP_H__
diff --git a/sflphone-common/libs/pjproject/pjsip/include/pjsip/sip_transport_tls.h b/sflphone-common/libs/pjproject/pjsip/include/pjsip/sip_transport_tls.h
index a9210b43c37390f5a7f6a5d9e805376b3639e00b..f0977cee44eba1058a2b5cf0f94ab9b84587759d 100644
--- a/sflphone-common/libs/pjproject/pjsip/include/pjsip/sip_transport_tls.h
+++ b/sflphone-common/libs/pjproject/pjsip/include/pjsip/sip_transport_tls.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJSIP_TRANSPORT_TLS_H__
#define __PJSIP_TRANSPORT_TLS_H__
diff --git a/sflphone-common/libs/pjproject/pjsip/include/pjsip/sip_transport_udp.h b/sflphone-common/libs/pjproject/pjsip/include/pjsip/sip_transport_udp.h
index 383073c9f2baa09c14b4f95e805d773eaebf30d3..a2806a68094cfd38a7bcce757742f9d160d3b05c 100644
--- a/sflphone-common/libs/pjproject/pjsip/include/pjsip/sip_transport_udp.h
+++ b/sflphone-common/libs/pjproject/pjsip/include/pjsip/sip_transport_udp.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJSIP_TRANSPORT_UDP_H__
#define __PJSIP_TRANSPORT_UDP_H__
diff --git a/sflphone-common/libs/pjproject/pjsip/include/pjsip/sip_types.h b/sflphone-common/libs/pjproject/pjsip/include/pjsip/sip_types.h
index 717605dcd2f5ed2b994c5439f96a66fca39318ef..46bd03702efcca3bcfc8287a129c1ec1c236bc42 100644
--- a/sflphone-common/libs/pjproject/pjsip/include/pjsip/sip_types.h
+++ b/sflphone-common/libs/pjproject/pjsip/include/pjsip/sip_types.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJSIP_SIP_TYPES_H__
#define __PJSIP_SIP_TYPES_H__
diff --git a/sflphone-common/libs/pjproject/pjsip/include/pjsip/sip_ua_layer.h b/sflphone-common/libs/pjproject/pjsip/include/pjsip/sip_ua_layer.h
index a94a1d7d0c14320388da6dbc8cb130a578491790..beb2b900276d63565ec2a7afee234c7833c6da24 100644
--- a/sflphone-common/libs/pjproject/pjsip/include/pjsip/sip_ua_layer.h
+++ b/sflphone-common/libs/pjproject/pjsip/include/pjsip/sip_ua_layer.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJSIP_SIP_UA_LAYER_H__
#define __PJSIP_SIP_UA_LAYER_H__
diff --git a/sflphone-common/libs/pjproject/pjsip/include/pjsip/sip_uri.h b/sflphone-common/libs/pjproject/pjsip/include/pjsip/sip_uri.h
index e5458e4bb15fd2050e51b6b8db8584ddc80dec95..e4ed757abcebc9c6fe4a7928755b28c5a7aa9960 100644
--- a/sflphone-common/libs/pjproject/pjsip/include/pjsip/sip_uri.h
+++ b/sflphone-common/libs/pjproject/pjsip/include/pjsip/sip_uri.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJSIP_SIP_URI_H__
#define __PJSIP_SIP_URI_H__
diff --git a/sflphone-common/libs/pjproject/pjsip/include/pjsip/sip_util.h b/sflphone-common/libs/pjproject/pjsip/include/pjsip/sip_util.h
index 43a9cab21394d7d97e8671e16bced6350066ccb5..04b53735c6c661f77e4358eb7c789ea870cb9de6 100644
--- a/sflphone-common/libs/pjproject/pjsip/include/pjsip/sip_util.h
+++ b/sflphone-common/libs/pjproject/pjsip/include/pjsip/sip_util.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJSIP_SIP_MISC_H__
#define __PJSIP_SIP_MISC_H__
diff --git a/sflphone-common/libs/pjproject/pjsip/include/pjsip_auth.h b/sflphone-common/libs/pjproject/pjsip/include/pjsip_auth.h
index 1fb8abee040a23d0891140005c0a910979215705..662cd6e28a9193f09525ea12d174d0a660dd78b4 100644
--- a/sflphone-common/libs/pjproject/pjsip/include/pjsip_auth.h
+++ b/sflphone-common/libs/pjproject/pjsip/include/pjsip_auth.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJSIP_AUTH_H__
#define __PJSIP_AUTH_H__
diff --git a/sflphone-common/libs/pjproject/pjsip/include/pjsip_simple.h b/sflphone-common/libs/pjproject/pjsip/include/pjsip_simple.h
index f9fb8643b9c6cc646d5a56d05213a25cdd6e7887..df676124e44d8517db728dcfb615700694a921e8 100644
--- a/sflphone-common/libs/pjproject/pjsip/include/pjsip_simple.h
+++ b/sflphone-common/libs/pjproject/pjsip/include/pjsip_simple.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
/**
diff --git a/sflphone-common/libs/pjproject/pjsip/include/pjsip_ua.h b/sflphone-common/libs/pjproject/pjsip/include/pjsip_ua.h
index 94682667a84c9910dac4c18201f40d603b8cce55..e285b24b9b6cc2c3a7a66f3c5bdee881e72ce0ef 100644
--- a/sflphone-common/libs/pjproject/pjsip/include/pjsip_ua.h
+++ b/sflphone-common/libs/pjproject/pjsip/include/pjsip_ua.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJSIP_UA_H__
#define __PJSIP_UA_H__
diff --git a/sflphone-common/libs/pjproject/pjsip/include/pjsua-lib/pjsua.h b/sflphone-common/libs/pjproject/pjsip/include/pjsua-lib/pjsua.h
index 6821f60aa8a54f579a73ace990aca27753f53500..4a55e9a57204461e30b911e7c909eae2e575cd0b 100644
--- a/sflphone-common/libs/pjproject/pjsip/include/pjsua-lib/pjsua.h
+++ b/sflphone-common/libs/pjproject/pjsip/include/pjsua-lib/pjsua.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJSUA_H__
#define __PJSUA_H__
diff --git a/sflphone-common/libs/pjproject/pjsip/include/pjsua-lib/pjsua_internal.h b/sflphone-common/libs/pjproject/pjsip/include/pjsua-lib/pjsua_internal.h
index 86e8815cba4d5dc5ab2951377f51c5e7694bcfd8..830d48d98525e61e43141c56a37bf81ee614b7d5 100644
--- a/sflphone-common/libs/pjproject/pjsip/include/pjsua-lib/pjsua_internal.h
+++ b/sflphone-common/libs/pjproject/pjsip/include/pjsua-lib/pjsua_internal.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PJSUA_INTERNAL_H__
#define __PJSUA_INTERNAL_H__
diff --git a/sflphone-common/libs/pjproject/pjsip/src/pjsip-simple/errno.c b/sflphone-common/libs/pjproject/pjsip/src/pjsip-simple/errno.c
index 513a2e00997e8b10372c320d5e4b6bb669573fe1..8567c0ad04bf4685838ddb756255df65188f42c0 100644
--- a/sflphone-common/libs/pjproject/pjsip/src/pjsip-simple/errno.c
+++ b/sflphone-common/libs/pjproject/pjsip/src/pjsip-simple/errno.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pjsip-simple/errno.h>
#include <pj/string.h>
diff --git a/sflphone-common/libs/pjproject/pjsip/src/pjsip-simple/evsub.c b/sflphone-common/libs/pjproject/pjsip/src/pjsip-simple/evsub.c
index 571c971786dde180ca75abef48386c400c756e88..19c94eecc05e87039cea690d828c772661161291 100644
--- a/sflphone-common/libs/pjproject/pjsip/src/pjsip-simple/evsub.c
+++ b/sflphone-common/libs/pjproject/pjsip/src/pjsip-simple/evsub.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pjsip-simple/evsub.h>
#include <pjsip-simple/evsub_msg.h>
diff --git a/sflphone-common/libs/pjproject/pjsip/src/pjsip-simple/evsub_msg.c b/sflphone-common/libs/pjproject/pjsip/src/pjsip-simple/evsub_msg.c
index 940845ff425032046c01e3c31503ec0b4fd7b0bc..b210341a65caa8df3070112e605545731086d27f 100644
--- a/sflphone-common/libs/pjproject/pjsip/src/pjsip-simple/evsub_msg.c
+++ b/sflphone-common/libs/pjproject/pjsip/src/pjsip-simple/evsub_msg.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pjsip-simple/evsub_msg.h>
#include <pjsip/print_util.h>
diff --git a/sflphone-common/libs/pjproject/pjsip/src/pjsip-simple/iscomposing.c b/sflphone-common/libs/pjproject/pjsip/src/pjsip-simple/iscomposing.c
index 24068dfd68b4b069c455d9eb6c7b87c09384164d..3151411d3d91c697cda09667ccf051b36a49ccb8 100644
--- a/sflphone-common/libs/pjproject/pjsip/src/pjsip-simple/iscomposing.c
+++ b/sflphone-common/libs/pjproject/pjsip/src/pjsip-simple/iscomposing.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pjsip-simple/iscomposing.h>
#include <pjsip-simple/errno.h>
diff --git a/sflphone-common/libs/pjproject/pjsip/src/pjsip-simple/mwi.c b/sflphone-common/libs/pjproject/pjsip/src/pjsip-simple/mwi.c
index c8ae4645fcf96d228aee1d67d075428b4d41f5d5..53adcd5252f910150371ba4a5537710c2d40b669 100644
--- a/sflphone-common/libs/pjproject/pjsip/src/pjsip-simple/mwi.c
+++ b/sflphone-common/libs/pjproject/pjsip/src/pjsip-simple/mwi.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pjsip-simple/mwi.h>
#include <pjsip-simple/errno.h>
diff --git a/sflphone-common/libs/pjproject/pjsip/src/pjsip-simple/pidf.c b/sflphone-common/libs/pjproject/pjsip/src/pjsip-simple/pidf.c
index 63dcbec910a1f9e07245ef7f9f3594d0190c52e9..f5348b62c2b5943bb67905528f29f6116c5d2171 100644
--- a/sflphone-common/libs/pjproject/pjsip/src/pjsip-simple/pidf.c
+++ b/sflphone-common/libs/pjproject/pjsip/src/pjsip-simple/pidf.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pjsip-simple/pidf.h>
#include <pj/string.h>
diff --git a/sflphone-common/libs/pjproject/pjsip/src/pjsip-simple/presence.c b/sflphone-common/libs/pjproject/pjsip/src/pjsip-simple/presence.c
index d756d24099fa08d63e903bf0436634f12eafcb3b..09abf9c38755e806fd0a81d078847dec836ee148 100644
--- a/sflphone-common/libs/pjproject/pjsip/src/pjsip-simple/presence.c
+++ b/sflphone-common/libs/pjproject/pjsip/src/pjsip-simple/presence.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pjsip-simple/presence.h>
#include <pjsip-simple/errno.h>
diff --git a/sflphone-common/libs/pjproject/pjsip/src/pjsip-simple/presence_body.c b/sflphone-common/libs/pjproject/pjsip/src/pjsip-simple/presence_body.c
index a6069594b468d07aca398cc68ec38d4354a8b9d7..3054dd486e768d870fcf229ee51ac93e39202ca4 100644
--- a/sflphone-common/libs/pjproject/pjsip/src/pjsip-simple/presence_body.c
+++ b/sflphone-common/libs/pjproject/pjsip/src/pjsip-simple/presence_body.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pjsip-simple/presence.h>
#include <pjsip-simple/errno.h>
diff --git a/sflphone-common/libs/pjproject/pjsip/src/pjsip-simple/publishc.c b/sflphone-common/libs/pjproject/pjsip/src/pjsip-simple/publishc.c
index d4a7f8271e4e9c3fe60761a439b3c56c768d639a..9ec24696e3a95c7ddc271d1cae138da17510a006 100644
--- a/sflphone-common/libs/pjproject/pjsip/src/pjsip-simple/publishc.c
+++ b/sflphone-common/libs/pjproject/pjsip/src/pjsip-simple/publishc.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pjsip-simple/publish.h>
#include <pjsip/sip_auth.h>
diff --git a/sflphone-common/libs/pjproject/pjsip/src/pjsip-simple/rpid.c b/sflphone-common/libs/pjproject/pjsip/src/pjsip-simple/rpid.c
index 0ec9d260b5f542ea301274327c2c2076ceeae3b6..4d4487c602fda01e0e66cd3a486b0535f6e85e6d 100644
--- a/sflphone-common/libs/pjproject/pjsip/src/pjsip-simple/rpid.c
+++ b/sflphone-common/libs/pjproject/pjsip/src/pjsip-simple/rpid.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pjsip-simple/rpid.h>
#include <pjsip-simple/errno.h>
diff --git a/sflphone-common/libs/pjproject/pjsip/src/pjsip-simple/xpidf.c b/sflphone-common/libs/pjproject/pjsip/src/pjsip-simple/xpidf.c
index f6892b42ad10505877bf8ae719bb6164c168c303..ba0a2b093c05e2ee02c5aaabcf3c2ce88c27839d 100644
--- a/sflphone-common/libs/pjproject/pjsip/src/pjsip-simple/xpidf.c
+++ b/sflphone-common/libs/pjproject/pjsip/src/pjsip-simple/xpidf.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pjsip-simple/xpidf.h>
#include <pj/assert.h>
diff --git a/sflphone-common/libs/pjproject/pjsip/src/pjsip-ua/sip_100rel.c b/sflphone-common/libs/pjproject/pjsip/src/pjsip-ua/sip_100rel.c
index 6ff45ff38346663b37ade80c8655d4d1066a2ec4..46442b547eff3118e5fe4b45a9096c50b26f3744 100644
--- a/sflphone-common/libs/pjproject/pjsip/src/pjsip-ua/sip_100rel.c
+++ b/sflphone-common/libs/pjproject/pjsip/src/pjsip-ua/sip_100rel.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pjsip-ua/sip_100rel.h>
#include <pjsip/sip_endpoint.h>
diff --git a/sflphone-common/libs/pjproject/pjsip/src/pjsip-ua/sip_inv.c b/sflphone-common/libs/pjproject/pjsip/src/pjsip-ua/sip_inv.c
index 9aba3bbcd1e918a4069752842e0493ae02c42ac4..a308cff8a713edc8832f741edac024dbe4729e89 100644
--- a/sflphone-common/libs/pjproject/pjsip/src/pjsip-ua/sip_inv.c
+++ b/sflphone-common/libs/pjproject/pjsip/src/pjsip-ua/sip_inv.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pjsip-ua/sip_inv.h>
#include <pjsip-ua/sip_100rel.h>
diff --git a/sflphone-common/libs/pjproject/pjsip/src/pjsip-ua/sip_reg.c b/sflphone-common/libs/pjproject/pjsip/src/pjsip-ua/sip_reg.c
index b09397271b19c1798f2c8aaae0a27205c203c436..20cd0700a1c5d4ab1a1b00284183d124eef675aa 100644
--- a/sflphone-common/libs/pjproject/pjsip/src/pjsip-ua/sip_reg.c
+++ b/sflphone-common/libs/pjproject/pjsip/src/pjsip-ua/sip_reg.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pjsip-ua/sip_regc.h>
#include <pjsip/sip_endpoint.h>
diff --git a/sflphone-common/libs/pjproject/pjsip/src/pjsip-ua/sip_replaces.c b/sflphone-common/libs/pjproject/pjsip/src/pjsip-ua/sip_replaces.c
index ce68407c58bb82f337768f4ca53a0513ad7e55c6..bacf7b94045fa2c68b090ee9e9114ea61fc3a76a 100644
--- a/sflphone-common/libs/pjproject/pjsip/src/pjsip-ua/sip_replaces.c
+++ b/sflphone-common/libs/pjproject/pjsip/src/pjsip-ua/sip_replaces.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pjsip-ua/sip_replaces.h>
#include <pjsip-ua/sip_inv.h>
diff --git a/sflphone-common/libs/pjproject/pjsip/src/pjsip-ua/sip_timer.c b/sflphone-common/libs/pjproject/pjsip/src/pjsip-ua/sip_timer.c
index 715585a39faafe780cb0ff5432558b183c5a0dc6..440897e7a09e18f42860c9e1540a122c3960fbc1 100644
--- a/sflphone-common/libs/pjproject/pjsip/src/pjsip-ua/sip_timer.c
+++ b/sflphone-common/libs/pjproject/pjsip/src/pjsip-ua/sip_timer.c
@@ -15,6 +15,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pjsip-ua/sip_timer.h>
#include <pjsip/print_util.h>
diff --git a/sflphone-common/libs/pjproject/pjsip/src/pjsip-ua/sip_xfer.c b/sflphone-common/libs/pjproject/pjsip/src/pjsip-ua/sip_xfer.c
index 6a150b93de0d16d386399cc65bbf718002222b3f..2dbeccd63405caf57c3c753109fcdeaa9215a8f2 100644
--- a/sflphone-common/libs/pjproject/pjsip/src/pjsip-ua/sip_xfer.c
+++ b/sflphone-common/libs/pjproject/pjsip/src/pjsip-ua/sip_xfer.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pjsip-ua/sip_xfer.h>
#include <pjsip-simple/evsub_msg.h>
diff --git a/sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_auth_aka.c b/sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_auth_aka.c
index d79398be416f9720a5c4896e1e4e900256bb154e..2122ae5c0e6fe3d87c76367256bc55e8bdec17c0 100644
--- a/sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_auth_aka.c
+++ b/sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_auth_aka.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pjsip/sip_auth_aka.h>
#include <pjsip/sip_errno.h>
diff --git a/sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_auth_client.c b/sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_auth_client.c
index fc734f7a153efbdeaf6b87754937a737cdc44498..544c01ee65436b3aa09b4d0598f4a50ba17d3cbb 100644
--- a/sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_auth_client.c
+++ b/sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_auth_client.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pjsip/sip_auth.h>
diff --git a/sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_auth_msg.c b/sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_auth_msg.c
index 746aea85cb76ab77374fe04159141909eabc0087..9e3b95b0727e03ffdd3e77bf4c41c897a1c0d494 100644
--- a/sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_auth_msg.c
+++ b/sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_auth_msg.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pjsip/sip_auth_msg.h>
#include <pjsip/sip_auth_parser.h>
diff --git a/sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_auth_parser.c b/sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_auth_parser.c
index 0a20a5073372b8673f0901f5d5f4c2b18a6c0dc8..3b912b25e7b92797f56422208818e9ff33a5bde9 100644
--- a/sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_auth_parser.c
+++ b/sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_auth_parser.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pjsip/sip_auth_parser.h>
#include <pjsip/sip_auth_msg.h>
diff --git a/sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_auth_parser_wrap.cpp b/sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_auth_parser_wrap.cpp
index 0f58a977e0261ad97c7dd6a369e9d6bf0f20803a..bf9d1c2954a93a8037b41c16bfed88337955862e 100644
--- a/sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_auth_parser_wrap.cpp
+++ b/sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_auth_parser_wrap.cpp
@@ -15,6 +15,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
/*
diff --git a/sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_auth_server.c b/sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_auth_server.c
index 1a557d7a12d49b112e68c561eabfb0b7e4df07e8..4f597301804d563c33159a04d3a38f3f53183a16 100644
--- a/sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_auth_server.c
+++ b/sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_auth_server.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pjsip/sip_auth.h>
diff --git a/sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_config.c b/sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_config.c
index 6df63e402255920a9a911a1f03448b9b20b42d45..d77908c56753fa05f0bf470e0a885eb8486f15be 100644
--- a/sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_config.c
+++ b/sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_config.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pjsip/sip_config.h>
diff --git a/sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_dialog.c b/sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_dialog.c
index 1d2de50fdb51275c78e98b67e91f1dfb998ba4da..2388d74334fa98db144a74fb1b46db9df0353784 100644
--- a/sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_dialog.c
+++ b/sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_dialog.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pjsip/sip_dialog.h>
#include <pjsip/sip_ua_layer.h>
diff --git a/sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_dialog_wrap.cpp b/sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_dialog_wrap.cpp
index 1dee2f2cc88dc343cefd477751ec884e764b8a7e..ace0c93ac9d35291644ef89155df284b2e4614b0 100644
--- a/sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_dialog_wrap.cpp
+++ b/sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_dialog_wrap.cpp
@@ -15,6 +15,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
/*
diff --git a/sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_endpoint.c b/sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_endpoint.c
index 9d4daad882513d2602fea18d8fd34121f4d7af9d..0a707f70da4d18903f302dfb053922c7e09efb26 100644
--- a/sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_endpoint.c
+++ b/sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_endpoint.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pjsip/sip_endpoint.h>
#include <pjsip/sip_transaction.h>
diff --git a/sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_endpoint_wrap.cpp b/sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_endpoint_wrap.cpp
index 55b157aee113a918c838e31cc782c38f3b84572f..dd16a70be1921b2b4800d7416cba5a213e9bf8df 100644
--- a/sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_endpoint_wrap.cpp
+++ b/sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_endpoint_wrap.cpp
@@ -15,6 +15,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
/*
diff --git a/sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_errno.c b/sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_errno.c
index 3460b78eadb7566b60ca4b32cf7175ea8d30da73..d376ab4e8567c0b37558ce8e5539ea9f55539a67 100644
--- a/sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_errno.c
+++ b/sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_errno.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pjsip/sip_errno.h>
#include <pjsip/sip_msg.h>
diff --git a/sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_msg.c b/sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_msg.c
index 97dc6c34eca40cc34f51597c0dc93f6312eac20c..5afdfdd6783d5521faff5a66ba3b13bb2c999774 100644
--- a/sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_msg.c
+++ b/sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_msg.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pjsip/sip_msg.h>
#include <pjsip/sip_parser.h>
diff --git a/sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_parser.c b/sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_parser.c
index 1212c0abba0d4b859aba5cc26bbac5ece5342cd5..da2dde5f6c261af3ef1e1b821d1e90fc6358d8f3 100644
--- a/sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_parser.c
+++ b/sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_parser.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pjsip/sip_parser.h>
#include <pjsip/sip_uri.h>
diff --git a/sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_parser_wrap.cpp b/sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_parser_wrap.cpp
index e27cd0429802382394649228f3da524bfb0d0c98..31a09b6f98ffdd64ba2fcfe1c43e9e55581ed0a5 100644
--- a/sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_parser_wrap.cpp
+++ b/sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_parser_wrap.cpp
@@ -15,6 +15,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
/*
diff --git a/sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_resolve.c b/sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_resolve.c
index 251bbb9e8b3fa96e03eefc0ed7e89fb82a07e9d9..6a927204624e32579e1ce4145ead70bf6f6f85cb 100644
--- a/sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_resolve.c
+++ b/sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_resolve.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pjsip/sip_resolve.h>
#include <pjsip/sip_transport.h>
diff --git a/sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_tel_uri.c b/sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_tel_uri.c
index 2832525e487a25a4bb8a97fa51d7ab606c071f0d..b4655e9835495f8795f93d1b4b2a7f67512b53b7 100644
--- a/sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_tel_uri.c
+++ b/sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_tel_uri.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pjsip/sip_tel_uri.h>
#include <pjsip/sip_msg.h>
diff --git a/sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_tel_uri_wrap.cpp b/sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_tel_uri_wrap.cpp
index f82281a3231d07b532bb308357b8e6bc7b69a325..a65c880b85295c93af9034a11f2d6ef3530f7634 100644
--- a/sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_tel_uri_wrap.cpp
+++ b/sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_tel_uri_wrap.cpp
@@ -15,6 +15,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
/*
diff --git a/sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_transaction.c b/sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_transaction.c
index 79b0866bafe9f12e084e9343b1fc0aff97411f15..0ad4f3929ddefeca0f1aa91f5d8687b3c1929e60 100644
--- a/sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_transaction.c
+++ b/sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_transaction.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pjsip/sip_transaction.h>
#include <pjsip/sip_util.h>
diff --git a/sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_transport.c b/sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_transport.c
index a26d3c3f532f666b689cf140b621422d9ef38180..0caa6977c3059968fe7bc2f9b2af1263923a7fed 100644
--- a/sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_transport.c
+++ b/sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_transport.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pjsip/sip_transport.h>
#include <pjsip/sip_endpoint.h>
diff --git a/sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_transport_loop.c b/sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_transport_loop.c
index e509d4b0988d03383066e7f4940bf9f28dfb4a4b..bb821c6a35d1596d307e25d65e518777fe03fb13 100644
--- a/sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_transport_loop.c
+++ b/sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_transport_loop.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pjsip/sip_transport_loop.h>
#include <pjsip/sip_endpoint.h>
diff --git a/sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_transport_tcp.c b/sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_transport_tcp.c
index 030cc8a427f08e217cad8ab91dfc93cd4d0812fc..60876d0a5ec7dc43de56bed6ba6a8cb35e06b022 100644
--- a/sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_transport_tcp.c
+++ b/sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_transport_tcp.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pjsip/sip_transport_tcp.h>
#include <pjsip/sip_endpoint.h>
diff --git a/sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_transport_tls.c b/sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_transport_tls.c
index 0c16f88c3ce6fe783e2a321f31810c788a05e358..e61c9fe00e3787a7fa31eddd3490c0629158af42 100644
--- a/sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_transport_tls.c
+++ b/sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_transport_tls.c
@@ -15,6 +15,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pjsip/sip_transport_tls.h>
diff --git a/sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_transport_tls_ossl.c b/sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_transport_tls_ossl.c
index cb815fc169edab9ae54b80a01a72fda59a2324c2..ba4e638c7aa8153350017561a55f9a5c19cb9535 100644
--- a/sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_transport_tls_ossl.c
+++ b/sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_transport_tls_ossl.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pjsip/sip_transport_tls.h>
#include <pjsip/sip_endpoint.h>
diff --git a/sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_transport_udp.c b/sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_transport_udp.c
index 1e31f98aef1cbb9557507c7bae14ab1d44a7b036..94b27e44f83210c8bcc30b2d10d8dd05fb13aab5 100644
--- a/sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_transport_udp.c
+++ b/sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_transport_udp.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pjsip/sip_transport_udp.h>
#include <pjsip/sip_endpoint.h>
diff --git a/sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_transport_wrap.cpp b/sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_transport_wrap.cpp
index 7fc80e2b170b2f3e136fc11d5c2c9f13b2a78fdc..94185c157f7194c56ecc4601a3f4e12c8c5e791c 100644
--- a/sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_transport_wrap.cpp
+++ b/sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_transport_wrap.cpp
@@ -15,6 +15,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
/*
diff --git a/sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_ua_layer.c b/sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_ua_layer.c
index 56672a9536ad0cebfe8b352f27244e896475a66c..74ef67906a134c8b091cfe4b59060dfa4f4cd992 100644
--- a/sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_ua_layer.c
+++ b/sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_ua_layer.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pjsip/sip_ua_layer.h>
#include <pjsip/sip_module.h>
diff --git a/sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_uri.c b/sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_uri.c
index afdd0c8f4048727ff43b335854e8848143353434..6e3bc54532e9952673bd4227d4a9b20cd76d6fe8 100644
--- a/sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_uri.c
+++ b/sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_uri.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pjsip/sip_uri.h>
#include <pjsip/sip_msg.h>
diff --git a/sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_util.c b/sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_util.c
index 421a3771c2cc45186262ff5b645cdf40e95596f8..cc83c12d3d2cd7f0d77996118737f516e9c2d177 100644
--- a/sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_util.c
+++ b/sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_util.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pjsip/sip_util.h>
#include <pjsip/sip_transport.h>
diff --git a/sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_util_proxy.c b/sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_util_proxy.c
index a050dfee8b5cd1ba4863f4e353d468d56cdcb794..f06635368a3d774ae893dfdf2608eb7368a69e24 100644
--- a/sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_util_proxy.c
+++ b/sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_util_proxy.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pjsip/sip_util.h>
#include <pjsip/sip_endpoint.h>
diff --git a/sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_util_proxy_wrap.cpp b/sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_util_proxy_wrap.cpp
index 0e394ee4f6f80a717f879ddba901477970e572b4..177a9c16f110ad0afd3d5d9fee0626310436810e 100644
--- a/sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_util_proxy_wrap.cpp
+++ b/sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_util_proxy_wrap.cpp
@@ -15,6 +15,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
/*
diff --git a/sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_util_statefull.c b/sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_util_statefull.c
index 9a6f7402cbec9cd348e350417cd93d9819953550..958fa29b703a1d10753288c3256eda81070a726a 100644
--- a/sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_util_statefull.c
+++ b/sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_util_statefull.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pjsip/sip_util.h>
#include <pjsip/sip_module.h>
diff --git a/sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_util_wrap.cpp b/sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_util_wrap.cpp
index 06a93441903cd22f55b1a4d6110ccd41e45c0728..10b481d29791ac83342702a5a7be8209e262e124 100644
--- a/sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_util_wrap.cpp
+++ b/sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_util_wrap.cpp
@@ -15,6 +15,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
/*
diff --git a/sflphone-common/libs/pjproject/pjsip/src/pjsua-lib/pjsua_acc.c b/sflphone-common/libs/pjproject/pjsip/src/pjsua-lib/pjsua_acc.c
index 26db69e35ab35feb5652eac79e31adf66e3793cb..016156dfd9d52c1c014724e6b0c41e5ef16ab856 100644
--- a/sflphone-common/libs/pjproject/pjsip/src/pjsua-lib/pjsua_acc.c
+++ b/sflphone-common/libs/pjproject/pjsip/src/pjsua-lib/pjsua_acc.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pjsua-lib/pjsua.h>
#include <pjsua-lib/pjsua_internal.h>
diff --git a/sflphone-common/libs/pjproject/pjsip/src/pjsua-lib/pjsua_call.c b/sflphone-common/libs/pjproject/pjsip/src/pjsua-lib/pjsua_call.c
index 4f882c531c3586c3cd7b3c541405a73305c324cd..3ce8a2641e60a991b6bd13c0705501e3de3b5317 100644
--- a/sflphone-common/libs/pjproject/pjsip/src/pjsua-lib/pjsua_call.c
+++ b/sflphone-common/libs/pjproject/pjsip/src/pjsua-lib/pjsua_call.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pjsua-lib/pjsua.h>
#include <pjsua-lib/pjsua_internal.h>
diff --git a/sflphone-common/libs/pjproject/pjsip/src/pjsua-lib/pjsua_core.c b/sflphone-common/libs/pjproject/pjsip/src/pjsua-lib/pjsua_core.c
index 7974c536c3ccda7bfc49c5906e4356634d1b2f7d..91805448d539092fa504c3794d69fe2061aaa889 100644
--- a/sflphone-common/libs/pjproject/pjsip/src/pjsua-lib/pjsua_core.c
+++ b/sflphone-common/libs/pjproject/pjsip/src/pjsua-lib/pjsua_core.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pjsua-lib/pjsua.h>
#include <pjsua-lib/pjsua_internal.h>
diff --git a/sflphone-common/libs/pjproject/pjsip/src/pjsua-lib/pjsua_im.c b/sflphone-common/libs/pjproject/pjsip/src/pjsua-lib/pjsua_im.c
index 9ccf0b02f9cccf54ac219c6d1b3c89e2a1cb8f7b..e4d78973f160aa12bb5e47379f22f8fe1322f56c 100644
--- a/sflphone-common/libs/pjproject/pjsip/src/pjsua-lib/pjsua_im.c
+++ b/sflphone-common/libs/pjproject/pjsip/src/pjsua-lib/pjsua_im.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pjsua-lib/pjsua.h>
#include <pjsua-lib/pjsua_internal.h>
diff --git a/sflphone-common/libs/pjproject/pjsip/src/pjsua-lib/pjsua_media.c b/sflphone-common/libs/pjproject/pjsip/src/pjsua-lib/pjsua_media.c
index c07cc9a1b0c09b84d96dde48a879405f30ea2ac3..15f51619b86b124e2e7ca2d82c2e4566fc3c734c 100644
--- a/sflphone-common/libs/pjproject/pjsip/src/pjsua-lib/pjsua_media.c
+++ b/sflphone-common/libs/pjproject/pjsip/src/pjsua-lib/pjsua_media.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pjsua-lib/pjsua.h>
#include <pjsua-lib/pjsua_internal.h>
diff --git a/sflphone-common/libs/pjproject/pjsip/src/pjsua-lib/pjsua_pres.c b/sflphone-common/libs/pjproject/pjsip/src/pjsua-lib/pjsua_pres.c
index 0f661da5cdc035f5578ba547b5d97131d72ec49e..c5b26c795556ade11f718e3304f1af5effea1777 100644
--- a/sflphone-common/libs/pjproject/pjsip/src/pjsua-lib/pjsua_pres.c
+++ b/sflphone-common/libs/pjproject/pjsip/src/pjsua-lib/pjsua_pres.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <pjsua-lib/pjsua.h>
#include <pjsua-lib/pjsua_internal.h>
diff --git a/sflphone-common/libs/pjproject/pjsip/src/test/dlg_core_test.c b/sflphone-common/libs/pjproject/pjsip/src/test/dlg_core_test.c
index 779f77db8a2641037f3d13a94469b26071d81638..c2f03f68a4f8998254c8ac891766540a2851d4c0 100644
--- a/sflphone-common/libs/pjproject/pjsip/src/test/dlg_core_test.c
+++ b/sflphone-common/libs/pjproject/pjsip/src/test/dlg_core_test.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include "test.h"
diff --git a/sflphone-common/libs/pjproject/pjsip/src/test/dns_test.c b/sflphone-common/libs/pjproject/pjsip/src/test/dns_test.c
index 656df9a428e8ca8cca1584089d9424c526db0732..51ac9a33d6f0c220271ed524be0aa00469c9558d 100644
--- a/sflphone-common/libs/pjproject/pjsip/src/test/dns_test.c
+++ b/sflphone-common/libs/pjproject/pjsip/src/test/dns_test.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include "test.h"
#include <pjsip.h>
diff --git a/sflphone-common/libs/pjproject/pjsip/src/test/inv_offer_answer_test.c b/sflphone-common/libs/pjproject/pjsip/src/test/inv_offer_answer_test.c
index 2e2b731bf181707c0e82332059839b1a75f5aa06..b238d7ab8680b64d54fe4f59c913c3e5648b9e15 100644
--- a/sflphone-common/libs/pjproject/pjsip/src/test/inv_offer_answer_test.c
+++ b/sflphone-common/libs/pjproject/pjsip/src/test/inv_offer_answer_test.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include "test.h"
diff --git a/sflphone-common/libs/pjproject/pjsip/src/test/main.c b/sflphone-common/libs/pjproject/pjsip/src/test/main.c
index 0a57898f021ecb88667de37078d6018300817774..bf384fc7c5920528edd09ea5e4fff2de47eb9f75 100644
--- a/sflphone-common/libs/pjproject/pjsip/src/test/main.c
+++ b/sflphone-common/libs/pjproject/pjsip/src/test/main.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include "test.h"
#include <stdio.h>
diff --git a/sflphone-common/libs/pjproject/pjsip/src/test/msg_err_test.c b/sflphone-common/libs/pjproject/pjsip/src/test/msg_err_test.c
index 0958cd370ebc10898cd94d3a15ddc6ea4213b4d9..bb530c3f9f0685daf2c5825807f40efd8e371063 100644
--- a/sflphone-common/libs/pjproject/pjsip/src/test/msg_err_test.c
+++ b/sflphone-common/libs/pjproject/pjsip/src/test/msg_err_test.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include "test.h"
#include <pjsip.h>
diff --git a/sflphone-common/libs/pjproject/pjsip/src/test/msg_logger.c b/sflphone-common/libs/pjproject/pjsip/src/test/msg_logger.c
index 6226783978425e35cec4b13becc7bad6b11ac886..611476cdb853eec8de9d2b86d67163c1a629bdb0 100644
--- a/sflphone-common/libs/pjproject/pjsip/src/test/msg_logger.c
+++ b/sflphone-common/libs/pjproject/pjsip/src/test/msg_logger.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include "test.h"
#include <pjsip.h>
diff --git a/sflphone-common/libs/pjproject/pjsip/src/test/msg_test.c b/sflphone-common/libs/pjproject/pjsip/src/test/msg_test.c
index 270d76253ecb87ecd375ed6b717690ab405f34bb..6369fb280bbd0434831656e51fdae76ad622d507 100644
--- a/sflphone-common/libs/pjproject/pjsip/src/test/msg_test.c
+++ b/sflphone-common/libs/pjproject/pjsip/src/test/msg_test.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include "test.h"
#include <pjsip.h>
diff --git a/sflphone-common/libs/pjproject/pjsip/src/test/regc_test.c b/sflphone-common/libs/pjproject/pjsip/src/test/regc_test.c
index 34da9172524ae0d7bee7413a1159fca918d21f70..a2d4e6c08a14df3fe647b0d779c5db7f50186d0a 100644
--- a/sflphone-common/libs/pjproject/pjsip/src/test/regc_test.c
+++ b/sflphone-common/libs/pjproject/pjsip/src/test/regc_test.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include "test.h"
#include <pjsip_ua.h>
diff --git a/sflphone-common/libs/pjproject/pjsip/src/test/test.c b/sflphone-common/libs/pjproject/pjsip/src/test/test.c
index f72ea54a36dea4051dd6097e6846ae179e02e6f3..6377decab92e0b4a32d98a3494b20b2d08b25d6c 100644
--- a/sflphone-common/libs/pjproject/pjsip/src/test/test.c
+++ b/sflphone-common/libs/pjproject/pjsip/src/test/test.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
diff --git a/sflphone-common/libs/pjproject/pjsip/src/test/test.h b/sflphone-common/libs/pjproject/pjsip/src/test/test.h
index 8377642c69cbb4223d720db13951c91af6c84ab8..335aae89fe911541d3a9301e8d0b357b26fb7d2c 100644
--- a/sflphone-common/libs/pjproject/pjsip/src/test/test.h
+++ b/sflphone-common/libs/pjproject/pjsip/src/test/test.h
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __TEST_H__
#define __TEST_H__
diff --git a/sflphone-common/libs/pjproject/pjsip/src/test/transport_loop_test.c b/sflphone-common/libs/pjproject/pjsip/src/test/transport_loop_test.c
index e6b45c6e6fb7b87f670cb3a62a176388ff406c68..83a85ad62b2d02a4b63d65418934074b8b36d460 100644
--- a/sflphone-common/libs/pjproject/pjsip/src/test/transport_loop_test.c
+++ b/sflphone-common/libs/pjproject/pjsip/src/test/transport_loop_test.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include "test.h"
diff --git a/sflphone-common/libs/pjproject/pjsip/src/test/transport_tcp_test.c b/sflphone-common/libs/pjproject/pjsip/src/test/transport_tcp_test.c
index 52595c61f80bd488792433f948426928db6fce16..a5fe355afc7853eb1bc46bd666ca5b42263044a7 100644
--- a/sflphone-common/libs/pjproject/pjsip/src/test/transport_tcp_test.c
+++ b/sflphone-common/libs/pjproject/pjsip/src/test/transport_tcp_test.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include "test.h"
diff --git a/sflphone-common/libs/pjproject/pjsip/src/test/transport_test.c b/sflphone-common/libs/pjproject/pjsip/src/test/transport_test.c
index b5fd9bad46923cc69907b4195b99092b0b7080f3..7172b0b5823cadd692c253a8c1339ed9e92d7356 100644
--- a/sflphone-common/libs/pjproject/pjsip/src/test/transport_test.c
+++ b/sflphone-common/libs/pjproject/pjsip/src/test/transport_test.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include "test.h"
diff --git a/sflphone-common/libs/pjproject/pjsip/src/test/transport_udp_test.c b/sflphone-common/libs/pjproject/pjsip/src/test/transport_udp_test.c
index 78904839ab3db066d3ee6b7077049bb4f007329b..eec1c7bed651d142ddd1d6faeca71b12da4b79a3 100644
--- a/sflphone-common/libs/pjproject/pjsip/src/test/transport_udp_test.c
+++ b/sflphone-common/libs/pjproject/pjsip/src/test/transport_udp_test.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include "test.h"
diff --git a/sflphone-common/libs/pjproject/pjsip/src/test/tsx_basic_test.c b/sflphone-common/libs/pjproject/pjsip/src/test/tsx_basic_test.c
index 41ac5d2b2a4c65d044692e175ae3c334c87e90d9..c051bbe4f1834c9af57d529e4c05a12d8f201b1c 100644
--- a/sflphone-common/libs/pjproject/pjsip/src/test/tsx_basic_test.c
+++ b/sflphone-common/libs/pjproject/pjsip/src/test/tsx_basic_test.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include "test.h"
diff --git a/sflphone-common/libs/pjproject/pjsip/src/test/tsx_bench.c b/sflphone-common/libs/pjproject/pjsip/src/test/tsx_bench.c
index 9c74e0e62e7b29bf821c93144973a1127bc309e5..83c6849daad281e18b23a4e3c782c8ea7f084e8b 100644
--- a/sflphone-common/libs/pjproject/pjsip/src/test/tsx_bench.c
+++ b/sflphone-common/libs/pjproject/pjsip/src/test/tsx_bench.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include "test.h"
#include <pjsip.h>
diff --git a/sflphone-common/libs/pjproject/pjsip/src/test/tsx_uac_test.c b/sflphone-common/libs/pjproject/pjsip/src/test/tsx_uac_test.c
index 87ab5b257ebbbe18cf9209ae0679431f5dd240fe..fe34494c0e4dbf34f969a3ea42a5e02749653827 100644
--- a/sflphone-common/libs/pjproject/pjsip/src/test/tsx_uac_test.c
+++ b/sflphone-common/libs/pjproject/pjsip/src/test/tsx_uac_test.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include "test.h"
diff --git a/sflphone-common/libs/pjproject/pjsip/src/test/tsx_uas_test.c b/sflphone-common/libs/pjproject/pjsip/src/test/tsx_uas_test.c
index 3b25ce87600f337a08aafa9491b0e11c4d8408c3..9d848c1e94565f6e1afcef7c7e628ea5ec8ff9d6 100644
--- a/sflphone-common/libs/pjproject/pjsip/src/test/tsx_uas_test.c
+++ b/sflphone-common/libs/pjproject/pjsip/src/test/tsx_uas_test.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include "test.h"
diff --git a/sflphone-common/libs/pjproject/pjsip/src/test/txdata_test.c b/sflphone-common/libs/pjproject/pjsip/src/test/txdata_test.c
index 3df46d2047602d453edf9febcf27bad1b76248fa..070598aaa92ca3618eb85b36a47f0c755ae04ab6 100644
--- a/sflphone-common/libs/pjproject/pjsip/src/test/txdata_test.c
+++ b/sflphone-common/libs/pjproject/pjsip/src/test/txdata_test.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include "test.h"
diff --git a/sflphone-common/libs/pjproject/pjsip/src/test/uri_test.c b/sflphone-common/libs/pjproject/pjsip/src/test/uri_test.c
index f10d0b185a2a3b2999447215f6fdab3f4fdb8b3a..07a80ccb96385353971535ad21105232038fe501 100644
--- a/sflphone-common/libs/pjproject/pjsip/src/test/uri_test.c
+++ b/sflphone-common/libs/pjproject/pjsip/src/test/uri_test.c
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Teluu Inc. (http://www.teluu.com)
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include "test.h"
#include <pjsip.h>
diff --git a/sflphone-common/libs/pjproject/third_party/build/g7221/Makefile b/sflphone-common/libs/pjproject/third_party/build/g7221/Makefile
deleted file mode 100644
index 60590307f600325294032ecd76a674f9a4e4f2c2..0000000000000000000000000000000000000000
--- a/sflphone-common/libs/pjproject/third_party/build/g7221/Makefile
+++ /dev/null
@@ -1,63 +0,0 @@
-include ../../../build.mak
-include ../../../build/common.mak
-
-export LIBDIR := ../../lib
-
-RULES_MAK := $(PJDIR)/build/rules.mak
-
-export G7221_CODEC_LIB := ../../lib/libg7221codec-$(TARGET_NAME)$(LIBEXT)
-
-###############################################################################
-# Gather all flags.
-#
-export _CFLAGS := $(CC_CFLAGS) $(OS_CFLAGS) $(HOST_CFLAGS) $(M_CFLAGS) \
- $(CFLAGS) $(CC_INC)../.. $(CC_INC)../../g7221/common \
- $(CC_INC)../../g7221/common/stl-files \
- $(CC_INC)../../../pjlib/include
-export _CXXFLAGS:= $(_CFLAGS) $(CC_CXXFLAGS) $(OS_CXXFLAGS) $(M_CXXFLAGS) \
- $(HOST_CXXFLAGS) $(CXXFLAGS)
-export _LDFLAGS := $(CC_LDFLAGS) $(OS_LDFLAGS) $(M_LDFLAGS) $(HOST_LDFLAGS) \
- $(LDFLAGS)
-
-export G7221_CODEC_SRCDIR = ../../g7221
-export G7221_CODEC_OBJS = common/common.o common/huff_tab.o common/tables.o \
- common/basic_op.o \
- decode/coef2sam.o decode/dct4_s.o decode/decoder.o \
- encode/dct4_a.o encode/sam2coef.o encode/encoder.o
-
-export G7221_CODEC_CFLAGS = $(_CFLAGS)
-
-
-export CC_OUT CC AR RANLIB HOST_MV HOST_RM HOST_RMDIR HOST_MKDIR OBJEXT LD LDOUT
-###############################################################################
-# Main entry
-#
-# $(TARGET) is defined in os-$(OS_NAME).mak file in current directory.
-#
-TARGETS := libg7221codec
-
-all: $(TARGETS)
-
-doc:
- cd .. && doxygen docs/doxygen.cfg
-
-dep: depend
-distclean: realclean
-
-.PHONY: dep depend libg7221codec clean realclean distclean
-
-libg7221codec:
- $(MAKE) -f $(RULES_MAK) APP=G7221_CODEC app=libg7221codec $(G7221_CODEC_LIB)
-
-clean print_lib:
- $(MAKE) -f $(RULES_MAK) APP=G7221_CODEC app=libg7221codec $@
-
-realclean:
- $(subst @@,$(subst /,$(HOST_PSEP),.ilbc-$(TARGET_NAME).depend),$(HOST_RMR))
-
- $(MAKE) -f $(RULES_MAK) APP=G7221_CODEC app=libg7221codec $@
-
-depend:
- $(MAKE) -f $(RULES_MAK) APP=G7221_CODEC app=libg7221codec $@
-
-
diff --git a/sflphone-common/libs/pjproject/third_party/build/g7221/libg7221codec.dsp b/sflphone-common/libs/pjproject/third_party/build/g7221/libg7221codec.dsp
deleted file mode 100644
index 82cc644ab743d57463bffc389fd8ad8d2ed2fc12..0000000000000000000000000000000000000000
--- a/sflphone-common/libs/pjproject/third_party/build/g7221/libg7221codec.dsp
+++ /dev/null
@@ -1,186 +0,0 @@
-# Microsoft Developer Studio Project File - Name="libg7221codec" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Static Library" 0x0104
-
-CFG=libg7221codec - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "libg7221codec.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "libg7221codec.mak" CFG="libg7221codec - Win32 Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "libg7221codec - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "libg7221codec - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "libg7221codec - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "output\libg7221codec-i386-win32-vc6-release"
-# PROP Intermediate_Dir "output\libg7221codec-i386-win32-vc6-release"
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../.." /I "../../g7221/common" /I "../../g7221/common/stl-files" /I "../../../pjlib/include" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /FR /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\..\lib\libg7221codec-i386-win32-vc6-release.lib"
-
-!ELSEIF "$(CFG)" == "libg7221codec - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "output\libg7221codec-i386-win32-vc6-debug"
-# PROP Intermediate_Dir "output\libg7221codec-i386-win32-vc6-debug"
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../.." /I "../../g7221/common" /I "../../g7221/common/stl-files" /I "../../../pjlib/include" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /FR /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\..\lib\libg7221codec-i386-win32-vc6-debug.lib"
-
-!ENDIF
-
-# Begin Target
-
-# Name "libg7221codec - Win32 Release"
-# Name "libg7221codec - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Group "common"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\g7221\common\basic_op.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\g7221\common\basic_op.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\g7221\common\basic_op_i.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\g7221\common\common.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\g7221\common\count.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\g7221\common\defs.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\g7221\common\huff_def.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\g7221\common\huff_tab.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\g7221\common\huff_tab.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\g7221\common\tables.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\g7221\common\tables.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\g7221\common\typedef.h
-# End Source File
-# End Group
-# Begin Group "decode"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\g7221\decode\coef2sam.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\g7221\decode\dct4_s.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\g7221\decode\dct4_s.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\g7221\decode\decoder.c
-# End Source File
-# End Group
-# Begin Group "encode"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\g7221\encode\dct4_a.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\g7221\encode\dct4_a.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\g7221\encode\encoder.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\g7221\encode\sam2coef.c
-# End Source File
-# End Group
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# End Group
-# End Target
-# End Project
diff --git a/sflphone-common/libs/pjproject/third_party/build/g7221/libg7221codec.vcproj b/sflphone-common/libs/pjproject/third_party/build/g7221/libg7221codec.vcproj
deleted file mode 100644
index fb436777bd37b28292d242513f13a3afe38028c2..0000000000000000000000000000000000000000
--- a/sflphone-common/libs/pjproject/third_party/build/g7221/libg7221codec.vcproj
+++ /dev/null
@@ -1,6328 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="8.00"
- Name="libg7221codec"
- ProjectGUID="{2A3F241E-682C-47E1-9543-DC28708B406A}"
- RootNamespace="libg7221codec"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- <Platform
- Name="Windows Mobile 6 Standard SDK (ARMV4I)"
- />
- <Platform
- Name="Windows Mobile 6 Professional SDK (ARMV4I)"
- />
- <Platform
- Name="Pocket PC 2003 (ARMV4)"
- />
- <Platform
- Name="Smartphone 2003 (ARMV4)"
- />
- <Platform
- Name="Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
- />
- <Platform
- Name="Windows Mobile 5.0 Smartphone SDK (ARMV4I)"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Release|Win32"
- ConfigurationType="4"
- InheritedPropertySheets="..\..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\..\build\vs\pjproject-vs8-win32-release-defaults.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="../..;../../g7221/common;../../../pjlib/include"
- PreprocessorDefinitions="_LIB;"
- PrecompiledHeaderFile=""
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\$(ProjectName)-$(TargetCPU)-$(PlatformName)-vc$(VSVer)-$(ConfigurationName).lib"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Release|Windows Mobile 6 Standard SDK (ARMV4I)"
- ConfigurationType="4"
- InheritedPropertySheets="..\..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\..\build\vs\pjproject-vs8-wm6-release-defaults.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- ExecutionBucket="7"
- AdditionalIncludeDirectories="../..;../../g7221/common;../../../pjlib/include"
- PreprocessorDefinitions="_LIB;"
- PrecompiledHeaderFile=""
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\$(ProjectName)-$(TargetCPU)-wm6std-vc$(VSVer)-$(ConfigurationName).lib"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCCodeSignTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- <DeploymentTool
- ForceDirty="-1"
- RemoteDirectory=""
- RegisterOutput="0"
- AdditionalFiles=""
- />
- <DebuggerTool
- />
- </Configuration>
- <Configuration
- Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
- ConfigurationType="4"
- InheritedPropertySheets="..\..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\..\build\vs\pjproject-vs8-wm6-release-defaults.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- ExecutionBucket="7"
- AdditionalIncludeDirectories="../..;../../g7221/common;../../../pjlib/include"
- PreprocessorDefinitions="_LIB;"
- PrecompiledHeaderFile=""
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\$(ProjectName)-$(TargetCPU)-wm6pro-vc$(VSVer)-$(ConfigurationName).lib"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCCodeSignTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- <DeploymentTool
- ForceDirty="-1"
- RemoteDirectory=""
- RegisterOutput="0"
- AdditionalFiles=""
- />
- <DebuggerTool
- />
- </Configuration>
- <Configuration
- Name="Release|Pocket PC 2003 (ARMV4)"
- ConfigurationType="4"
- InheritedPropertySheets="..\..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\..\build\vs\pjproject-vs8-wm2003-release-defaults.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- ExecutionBucket="7"
- AdditionalIncludeDirectories="../..;../../g7221/common;../../../pjlib/include"
- PreprocessorDefinitions="_LIB;"
- PrecompiledHeaderFile=""
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\$(ProjectName)-$(TargetCPU)-wm2003ppc-vc$(VSVer)-$(ConfigurationName).lib"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCCodeSignTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- <DeploymentTool
- ForceDirty="-1"
- RemoteDirectory=""
- RegisterOutput="0"
- AdditionalFiles=""
- />
- <DebuggerTool
- />
- </Configuration>
- <Configuration
- Name="Release|Smartphone 2003 (ARMV4)"
- ConfigurationType="4"
- InheritedPropertySheets="..\..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\..\build\vs\pjproject-vs8-wm2003-release-defaults.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- ExecutionBucket="7"
- AdditionalIncludeDirectories="../..;../../g7221/common;../../../pjlib/include"
- PreprocessorDefinitions="_LIB;"
- PrecompiledHeaderFile=""
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\$(ProjectName)-$(TargetCPU)-wm2003sp-vc$(VSVer)-$(ConfigurationName).lib"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCCodeSignTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- <DeploymentTool
- ForceDirty="-1"
- RemoteDirectory=""
- RegisterOutput="0"
- AdditionalFiles=""
- />
- <DebuggerTool
- />
- </Configuration>
- <Configuration
- Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
- ConfigurationType="4"
- InheritedPropertySheets="..\..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\..\build\vs\pjproject-vs8-wm5-release-defaults.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- ExecutionBucket="7"
- AdditionalIncludeDirectories="../..;../../g7221/common;../../../pjlib/include"
- PreprocessorDefinitions="_LIB;"
- PrecompiledHeaderFile=""
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\$(ProjectName)-$(TargetCPU)-wm5ppc-vc$(VSVer)-$(ConfigurationName).lib"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCCodeSignTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- <DeploymentTool
- ForceDirty="-1"
- RemoteDirectory=""
- RegisterOutput="0"
- AdditionalFiles=""
- />
- <DebuggerTool
- />
- </Configuration>
- <Configuration
- Name="Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"
- ConfigurationType="4"
- InheritedPropertySheets="..\..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\..\build\vs\pjproject-vs8-wm5-release-defaults.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- ExecutionBucket="7"
- AdditionalIncludeDirectories="../..;../../g7221/common;../../../pjlib/include"
- PreprocessorDefinitions="_LIB;"
- PrecompiledHeaderFile=""
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\$(ProjectName)-$(TargetCPU)-wm5sp-vc$(VSVer)-$(ConfigurationName).lib"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCCodeSignTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- <DeploymentTool
- ForceDirty="-1"
- RemoteDirectory=""
- RegisterOutput="0"
- AdditionalFiles=""
- />
- <DebuggerTool
- />
- </Configuration>
- <Configuration
- Name="Debug|Win32"
- ConfigurationType="4"
- InheritedPropertySheets="..\..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\..\build\vs\pjproject-vs8-win32-common-defaults.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="../..;../../g7221/common;../../../pjlib/include"
- PreprocessorDefinitions="_LIB;"
- PrecompiledHeaderFile=""
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\$(ProjectName)-$(TargetCPU)-$(PlatformName)-vc$(VSVer)-$(ConfigurationName).lib"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Debug|Windows Mobile 6 Standard SDK (ARMV4I)"
- ConfigurationType="4"
- InheritedPropertySheets="..\..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\..\build\vs\pjproject-vs8-wm6-common-defaults.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- ExecutionBucket="7"
- Optimization="2"
- AdditionalIncludeDirectories="../..;../../g7221/common;../../../pjlib/include"
- PreprocessorDefinitions="_LIB;"
- PrecompiledHeaderFile=""
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\$(ProjectName)-$(TargetCPU)-wm6std-vc$(VSVer)-$(ConfigurationName).lib"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCCodeSignTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- <DeploymentTool
- ForceDirty="-1"
- RemoteDirectory=""
- RegisterOutput="0"
- AdditionalFiles=""
- />
- <DebuggerTool
- />
- </Configuration>
- <Configuration
- Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
- ConfigurationType="4"
- InheritedPropertySheets="..\..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\..\build\vs\pjproject-vs8-wm6-common-defaults.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- ExecutionBucket="7"
- Optimization="2"
- AdditionalIncludeDirectories="../..;../../g7221/common;../../../pjlib/include"
- PreprocessorDefinitions="_LIB;"
- PrecompiledHeaderFile=""
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\$(ProjectName)-$(TargetCPU)-wm6pro-vc$(VSVer)-$(ConfigurationName).lib"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCCodeSignTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- <DeploymentTool
- ForceDirty="-1"
- RemoteDirectory=""
- RegisterOutput="0"
- AdditionalFiles=""
- />
- <DebuggerTool
- />
- </Configuration>
- <Configuration
- Name="Debug|Pocket PC 2003 (ARMV4)"
- ConfigurationType="4"
- InheritedPropertySheets="..\..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\..\build\vs\pjproject-vs8-wm2003-common-defaults.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- ExecutionBucket="7"
- Optimization="2"
- AdditionalIncludeDirectories="../..;../../g7221/common;../../../pjlib/include"
- PreprocessorDefinitions="_LIB;"
- PrecompiledHeaderFile=""
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\$(ProjectName)-$(TargetCPU)-wm2003ppc-vc$(VSVer)-$(ConfigurationName).lib"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCCodeSignTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- <DeploymentTool
- ForceDirty="-1"
- RemoteDirectory=""
- RegisterOutput="0"
- AdditionalFiles=""
- />
- <DebuggerTool
- />
- </Configuration>
- <Configuration
- Name="Debug|Smartphone 2003 (ARMV4)"
- ConfigurationType="4"
- InheritedPropertySheets="..\..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\..\build\vs\pjproject-vs8-wm2003-common-defaults.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- ExecutionBucket="7"
- Optimization="2"
- AdditionalIncludeDirectories="../..;../../g7221/common;../../../pjlib/include"
- PreprocessorDefinitions="_LIB;"
- PrecompiledHeaderFile=""
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\$(ProjectName)-$(TargetCPU)-wm2003sp-vc$(VSVer)-$(ConfigurationName).lib"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCCodeSignTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- <DeploymentTool
- ForceDirty="-1"
- RemoteDirectory=""
- RegisterOutput="0"
- AdditionalFiles=""
- />
- <DebuggerTool
- />
- </Configuration>
- <Configuration
- Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
- ConfigurationType="4"
- InheritedPropertySheets="..\..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\..\build\vs\pjproject-vs8-wm5-common-defaults.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- ExecutionBucket="7"
- Optimization="2"
- AdditionalIncludeDirectories="../..;../../g7221/common;../../../pjlib/include"
- PreprocessorDefinitions="_LIB;"
- PrecompiledHeaderFile=""
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\$(ProjectName)-$(TargetCPU)-wm5ppc-vc$(VSVer)-$(ConfigurationName).lib"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCCodeSignTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- <DeploymentTool
- ForceDirty="-1"
- RemoteDirectory=""
- RegisterOutput="0"
- AdditionalFiles=""
- />
- <DebuggerTool
- />
- </Configuration>
- <Configuration
- Name="Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"
- ConfigurationType="4"
- InheritedPropertySheets="..\..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\..\build\vs\pjproject-vs8-wm5-common-defaults.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- ExecutionBucket="7"
- Optimization="2"
- AdditionalIncludeDirectories="../..;../../g7221/common;../../../pjlib/include"
- PreprocessorDefinitions="_LIB;"
- PrecompiledHeaderFile=""
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\$(ProjectName)-$(TargetCPU)-wm5sp-vc$(VSVer)-$(ConfigurationName).lib"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCCodeSignTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- <DeploymentTool
- ForceDirty="-1"
- RemoteDirectory=""
- RegisterOutput="0"
- AdditionalFiles=""
- />
- <DebuggerTool
- />
- </Configuration>
- <Configuration
- Name="Debug-Static|Win32"
- ConfigurationType="4"
- InheritedPropertySheets="..\..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\..\build\vs\pjproject-vs8-win32-common-defaults.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="../..;../../g7221/common;../../../pjlib/include"
- PreprocessorDefinitions="_LIB;"
- PrecompiledHeaderFile=""
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\$(ProjectName)-$(TargetCPU)-$(PlatformName)-vc$(VSVer)-$(ConfigurationName).lib"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Debug-Static|Windows Mobile 6 Standard SDK (ARMV4I)"
- ConfigurationType="4"
- InheritedPropertySheets="..\..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\..\build\vs\pjproject-vs8-wm6-common-defaults.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- ExecutionBucket="7"
- Optimization="2"
- AdditionalIncludeDirectories="../..;../../g7221/common;../../../pjlib/include"
- PreprocessorDefinitions="_LIB;"
- PrecompiledHeaderFile=""
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\$(ProjectName)-$(TargetCPU)-wm6std-vc$(VSVer)-$(ConfigurationName).lib"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCCodeSignTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- <DeploymentTool
- ForceDirty="-1"
- RemoteDirectory=""
- RegisterOutput="0"
- AdditionalFiles=""
- />
- <DebuggerTool
- />
- </Configuration>
- <Configuration
- Name="Debug-Static|Windows Mobile 6 Professional SDK (ARMV4I)"
- ConfigurationType="4"
- InheritedPropertySheets="..\..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\..\build\vs\pjproject-vs8-wm6-common-defaults.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- ExecutionBucket="7"
- Optimization="2"
- AdditionalIncludeDirectories="../..;../../g7221/common;../../../pjlib/include"
- PreprocessorDefinitions="_LIB;"
- PrecompiledHeaderFile=""
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\$(ProjectName)-$(TargetCPU)-wm6pro-vc$(VSVer)-$(ConfigurationName).lib"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCCodeSignTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- <DeploymentTool
- ForceDirty="-1"
- RemoteDirectory=""
- RegisterOutput="0"
- AdditionalFiles=""
- />
- <DebuggerTool
- />
- </Configuration>
- <Configuration
- Name="Debug-Static|Pocket PC 2003 (ARMV4)"
- ConfigurationType="4"
- InheritedPropertySheets="..\..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\..\build\vs\pjproject-vs8-wm2003-common-defaults.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- ExecutionBucket="7"
- Optimization="2"
- AdditionalIncludeDirectories="../..;../../g7221/common;../../../pjlib/include"
- PreprocessorDefinitions="_LIB;"
- PrecompiledHeaderFile=""
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\$(ProjectName)-$(TargetCPU)-wm2003ppc-vc$(VSVer)-$(ConfigurationName).lib"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCCodeSignTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- <DeploymentTool
- ForceDirty="-1"
- RemoteDirectory=""
- RegisterOutput="0"
- AdditionalFiles=""
- />
- <DebuggerTool
- />
- </Configuration>
- <Configuration
- Name="Debug-Static|Smartphone 2003 (ARMV4)"
- ConfigurationType="4"
- InheritedPropertySheets="..\..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\..\build\vs\pjproject-vs8-wm2003-common-defaults.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- ExecutionBucket="7"
- Optimization="2"
- AdditionalIncludeDirectories="../..;../../g7221/common;../../../pjlib/include"
- PreprocessorDefinitions="_LIB;"
- PrecompiledHeaderFile=""
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\$(ProjectName)-$(TargetCPU)-wm2003sp-vc$(VSVer)-$(ConfigurationName).lib"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCCodeSignTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- <DeploymentTool
- ForceDirty="-1"
- RemoteDirectory=""
- RegisterOutput="0"
- AdditionalFiles=""
- />
- <DebuggerTool
- />
- </Configuration>
- <Configuration
- Name="Debug-Static|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
- ConfigurationType="4"
- InheritedPropertySheets="..\..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\..\build\vs\pjproject-vs8-wm5-common-defaults.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- ExecutionBucket="7"
- Optimization="2"
- AdditionalIncludeDirectories="../..;../../g7221/common;../../../pjlib/include"
- PreprocessorDefinitions="_LIB;"
- PrecompiledHeaderFile=""
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\$(ProjectName)-$(TargetCPU)-wm5ppc-vc$(VSVer)-$(ConfigurationName).lib"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCCodeSignTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- <DeploymentTool
- ForceDirty="-1"
- RemoteDirectory=""
- RegisterOutput="0"
- AdditionalFiles=""
- />
- <DebuggerTool
- />
- </Configuration>
- <Configuration
- Name="Debug-Static|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"
- ConfigurationType="4"
- InheritedPropertySheets="..\..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\..\build\vs\pjproject-vs8-wm5-common-defaults.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- ExecutionBucket="7"
- Optimization="2"
- AdditionalIncludeDirectories="../..;../../g7221/common;../../../pjlib/include"
- PreprocessorDefinitions="_LIB;"
- PrecompiledHeaderFile=""
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\$(ProjectName)-$(TargetCPU)-wm5sp-vc$(VSVer)-$(ConfigurationName).lib"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCCodeSignTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- <DeploymentTool
- ForceDirty="-1"
- RemoteDirectory=""
- RegisterOutput="0"
- AdditionalFiles=""
- />
- <DebuggerTool
- />
- </Configuration>
- <Configuration
- Name="Debug-Dynamic|Win32"
- ConfigurationType="4"
- InheritedPropertySheets="..\..\..\build\vs\pjproject-vs8-debug-dynamic-defaults.vsprops;..\..\..\build\vs\pjproject-vs8-win32-common-defaults.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="../..;../../g7221/common;../../../pjlib/include"
- PreprocessorDefinitions="_LIB;"
- PrecompiledHeaderFile=""
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\$(ProjectName)-$(TargetCPU)-$(PlatformName)-vc$(VSVer)-$(ConfigurationName).lib"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Debug-Dynamic|Windows Mobile 6 Standard SDK (ARMV4I)"
- ConfigurationType="4"
- InheritedPropertySheets="..\..\..\build\vs\pjproject-vs8-debug-dynamic-defaults.vsprops;..\..\..\build\vs\pjproject-vs8-wm6-common-defaults.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- ExecutionBucket="7"
- Optimization="2"
- AdditionalIncludeDirectories="../..;../../g7221/common;../../../pjlib/include"
- PreprocessorDefinitions="_LIB;"
- PrecompiledHeaderFile=""
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\$(ProjectName)-$(TargetCPU)-wm6std-vc$(VSVer)-$(ConfigurationName).lib"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCCodeSignTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- <DeploymentTool
- ForceDirty="-1"
- RemoteDirectory=""
- RegisterOutput="0"
- AdditionalFiles=""
- />
- <DebuggerTool
- />
- </Configuration>
- <Configuration
- Name="Debug-Dynamic|Windows Mobile 6 Professional SDK (ARMV4I)"
- ConfigurationType="4"
- InheritedPropertySheets="..\..\..\build\vs\pjproject-vs8-debug-dynamic-defaults.vsprops;..\..\..\build\vs\pjproject-vs8-wm6-common-defaults.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- ExecutionBucket="7"
- Optimization="2"
- AdditionalIncludeDirectories="../..;../../g7221/common;../../../pjlib/include"
- PreprocessorDefinitions="_LIB;"
- PrecompiledHeaderFile=""
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\$(ProjectName)-$(TargetCPU)-wm6pro-vc$(VSVer)-$(ConfigurationName).lib"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCCodeSignTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- <DeploymentTool
- ForceDirty="-1"
- RemoteDirectory=""
- RegisterOutput="0"
- AdditionalFiles=""
- />
- <DebuggerTool
- />
- </Configuration>
- <Configuration
- Name="Debug-Dynamic|Pocket PC 2003 (ARMV4)"
- ConfigurationType="4"
- InheritedPropertySheets="..\..\..\build\vs\pjproject-vs8-debug-dynamic-defaults.vsprops;..\..\..\build\vs\pjproject-vs8-wm2003-common-defaults.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- ExecutionBucket="7"
- Optimization="2"
- AdditionalIncludeDirectories="../..;../../g7221/common;../../../pjlib/include"
- PreprocessorDefinitions="_LIB;"
- PrecompiledHeaderFile=""
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\$(ProjectName)-$(TargetCPU)-wm2003ppc-vc$(VSVer)-$(ConfigurationName).lib"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCCodeSignTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- <DeploymentTool
- ForceDirty="-1"
- RemoteDirectory=""
- RegisterOutput="0"
- AdditionalFiles=""
- />
- <DebuggerTool
- />
- </Configuration>
- <Configuration
- Name="Debug-Dynamic|Smartphone 2003 (ARMV4)"
- ConfigurationType="4"
- InheritedPropertySheets="..\..\..\build\vs\pjproject-vs8-debug-dynamic-defaults.vsprops;..\..\..\build\vs\pjproject-vs8-wm2003-common-defaults.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- ExecutionBucket="7"
- Optimization="2"
- AdditionalIncludeDirectories="../..;../../g7221/common;../../../pjlib/include"
- PreprocessorDefinitions="_LIB;"
- PrecompiledHeaderFile=""
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\$(ProjectName)-$(TargetCPU)-wm2003sp-vc$(VSVer)-$(ConfigurationName).lib"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCCodeSignTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- <DeploymentTool
- ForceDirty="-1"
- RemoteDirectory=""
- RegisterOutput="0"
- AdditionalFiles=""
- />
- <DebuggerTool
- />
- </Configuration>
- <Configuration
- Name="Debug-Dynamic|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
- ConfigurationType="4"
- InheritedPropertySheets="..\..\..\build\vs\pjproject-vs8-debug-dynamic-defaults.vsprops;..\..\..\build\vs\pjproject-vs8-wm5-common-defaults.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- ExecutionBucket="7"
- Optimization="2"
- AdditionalIncludeDirectories="../..;../../g7221/common;../../../pjlib/include"
- PreprocessorDefinitions="_LIB;"
- PrecompiledHeaderFile=""
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\$(ProjectName)-$(TargetCPU)-wm5ppc-vc$(VSVer)-$(ConfigurationName).lib"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCCodeSignTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- <DeploymentTool
- ForceDirty="-1"
- RemoteDirectory=""
- RegisterOutput="0"
- AdditionalFiles=""
- />
- <DebuggerTool
- />
- </Configuration>
- <Configuration
- Name="Debug-Dynamic|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"
- ConfigurationType="4"
- InheritedPropertySheets="..\..\..\build\vs\pjproject-vs8-debug-dynamic-defaults.vsprops;..\..\..\build\vs\pjproject-vs8-wm5-common-defaults.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- ExecutionBucket="7"
- Optimization="2"
- AdditionalIncludeDirectories="../..;../../g7221/common;../../../pjlib/include"
- PreprocessorDefinitions="_LIB;"
- PrecompiledHeaderFile=""
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\$(ProjectName)-$(TargetCPU)-wm5sp-vc$(VSVer)-$(ConfigurationName).lib"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCCodeSignTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- <DeploymentTool
- ForceDirty="-1"
- RemoteDirectory=""
- RegisterOutput="0"
- AdditionalFiles=""
- />
- <DebuggerTool
- />
- </Configuration>
- <Configuration
- Name="Release-Static|Win32"
- ConfigurationType="4"
- InheritedPropertySheets="..\..\..\build\vs\pjproject-vs8-release-static-defaults.vsprops;..\..\..\build\vs\pjproject-vs8-win32-release-defaults.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="../..;../../g7221/common;../../../pjlib/include"
- PreprocessorDefinitions="_LIB;"
- PrecompiledHeaderFile=""
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\$(ProjectName)-$(TargetCPU)-$(PlatformName)-vc$(VSVer)-$(ConfigurationName).lib"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Release-Static|Windows Mobile 6 Standard SDK (ARMV4I)"
- ConfigurationType="4"
- InheritedPropertySheets="..\..\..\build\vs\pjproject-vs8-release-static-defaults.vsprops;..\..\..\build\vs\pjproject-vs8-wm6-release-defaults.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- ExecutionBucket="7"
- AdditionalIncludeDirectories="../..;../../g7221/common;../../../pjlib/include"
- PreprocessorDefinitions="_LIB;"
- PrecompiledHeaderFile=""
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\$(ProjectName)-$(TargetCPU)-wm6std-vc$(VSVer)-$(ConfigurationName).lib"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCCodeSignTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- <DeploymentTool
- ForceDirty="-1"
- RemoteDirectory=""
- RegisterOutput="0"
- AdditionalFiles=""
- />
- <DebuggerTool
- />
- </Configuration>
- <Configuration
- Name="Release-Static|Windows Mobile 6 Professional SDK (ARMV4I)"
- ConfigurationType="4"
- InheritedPropertySheets="..\..\..\build\vs\pjproject-vs8-release-static-defaults.vsprops;..\..\..\build\vs\pjproject-vs8-wm6-release-defaults.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- ExecutionBucket="7"
- AdditionalIncludeDirectories="../..;../../g7221/common;../../../pjlib/include"
- PreprocessorDefinitions="_LIB;"
- PrecompiledHeaderFile=""
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\$(ProjectName)-$(TargetCPU)-wm6pro-vc$(VSVer)-$(ConfigurationName).lib"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCCodeSignTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- <DeploymentTool
- ForceDirty="-1"
- RemoteDirectory=""
- RegisterOutput="0"
- AdditionalFiles=""
- />
- <DebuggerTool
- />
- </Configuration>
- <Configuration
- Name="Release-Static|Pocket PC 2003 (ARMV4)"
- ConfigurationType="4"
- InheritedPropertySheets="..\..\..\build\vs\pjproject-vs8-release-static-defaults.vsprops;..\..\..\build\vs\pjproject-vs8-wm2003-release-defaults.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- ExecutionBucket="7"
- AdditionalIncludeDirectories="../..;../../g7221/common;../../../pjlib/include"
- PreprocessorDefinitions="_LIB;"
- PrecompiledHeaderFile=""
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\$(ProjectName)-$(TargetCPU)-wm2003ppc-vc$(VSVer)-$(ConfigurationName).lib"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCCodeSignTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- <DeploymentTool
- ForceDirty="-1"
- RemoteDirectory=""
- RegisterOutput="0"
- AdditionalFiles=""
- />
- <DebuggerTool
- />
- </Configuration>
- <Configuration
- Name="Release-Static|Smartphone 2003 (ARMV4)"
- ConfigurationType="4"
- InheritedPropertySheets="..\..\..\build\vs\pjproject-vs8-release-static-defaults.vsprops;..\..\..\build\vs\pjproject-vs8-wm2003-release-defaults.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- ExecutionBucket="7"
- AdditionalIncludeDirectories="../..;../../g7221/common;../../../pjlib/include"
- PreprocessorDefinitions="_LIB;"
- PrecompiledHeaderFile=""
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\$(ProjectName)-$(TargetCPU)-wm2003sp-vc$(VSVer)-$(ConfigurationName).lib"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCCodeSignTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- <DeploymentTool
- ForceDirty="-1"
- RemoteDirectory=""
- RegisterOutput="0"
- AdditionalFiles=""
- />
- <DebuggerTool
- />
- </Configuration>
- <Configuration
- Name="Release-Static|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
- ConfigurationType="4"
- InheritedPropertySheets="..\..\..\build\vs\pjproject-vs8-release-static-defaults.vsprops;..\..\..\build\vs\pjproject-vs8-wm5-release-defaults.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- ExecutionBucket="7"
- AdditionalIncludeDirectories="../..;../../g7221/common;../../../pjlib/include"
- PreprocessorDefinitions="_LIB;"
- PrecompiledHeaderFile=""
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\$(ProjectName)-$(TargetCPU)-wm5ppc-vc$(VSVer)-$(ConfigurationName).lib"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCCodeSignTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- <DeploymentTool
- ForceDirty="-1"
- RemoteDirectory=""
- RegisterOutput="0"
- AdditionalFiles=""
- />
- <DebuggerTool
- />
- </Configuration>
- <Configuration
- Name="Release-Static|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"
- ConfigurationType="4"
- InheritedPropertySheets="..\..\..\build\vs\pjproject-vs8-release-static-defaults.vsprops;..\..\..\build\vs\pjproject-vs8-wm5-release-defaults.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- ExecutionBucket="7"
- AdditionalIncludeDirectories="../..;../../g7221/common;../../../pjlib/include"
- PreprocessorDefinitions="_LIB;"
- PrecompiledHeaderFile=""
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\$(ProjectName)-$(TargetCPU)-wm5sp-vc$(VSVer)-$(ConfigurationName).lib"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCCodeSignTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- <DeploymentTool
- ForceDirty="-1"
- RemoteDirectory=""
- RegisterOutput="0"
- AdditionalFiles=""
- />
- <DebuggerTool
- />
- </Configuration>
- <Configuration
- Name="Release-Dynamic|Win32"
- ConfigurationType="4"
- InheritedPropertySheets="..\..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\..\build\vs\pjproject-vs8-win32-release-defaults.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="../..;../../g7221/common;../../../pjlib/include"
- PreprocessorDefinitions="_LIB;"
- PrecompiledHeaderFile=""
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\$(ProjectName)-$(TargetCPU)-$(PlatformName)-vc$(VSVer)-$(ConfigurationName).lib"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Release-Dynamic|Windows Mobile 6 Standard SDK (ARMV4I)"
- ConfigurationType="4"
- InheritedPropertySheets="..\..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\..\build\vs\pjproject-vs8-wm6-release-defaults.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- ExecutionBucket="7"
- AdditionalIncludeDirectories="../..;../../g7221/common;../../../pjlib/include"
- PreprocessorDefinitions="_LIB;"
- PrecompiledHeaderFile=""
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\$(ProjectName)-$(TargetCPU)-wm6std-vc$(VSVer)-$(ConfigurationName).lib"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCCodeSignTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- <DeploymentTool
- ForceDirty="-1"
- RemoteDirectory=""
- RegisterOutput="0"
- AdditionalFiles=""
- />
- <DebuggerTool
- />
- </Configuration>
- <Configuration
- Name="Release-Dynamic|Windows Mobile 6 Professional SDK (ARMV4I)"
- ConfigurationType="4"
- InheritedPropertySheets="..\..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\..\build\vs\pjproject-vs8-wm6-release-defaults.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- ExecutionBucket="7"
- AdditionalIncludeDirectories="../..;../../g7221/common;../../../pjlib/include"
- PreprocessorDefinitions="_LIB;"
- PrecompiledHeaderFile=""
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\$(ProjectName)-$(TargetCPU)-wm6pro-vc$(VSVer)-$(ConfigurationName).lib"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCCodeSignTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- <DeploymentTool
- ForceDirty="-1"
- RemoteDirectory=""
- RegisterOutput="0"
- AdditionalFiles=""
- />
- <DebuggerTool
- />
- </Configuration>
- <Configuration
- Name="Release-Dynamic|Pocket PC 2003 (ARMV4)"
- ConfigurationType="4"
- InheritedPropertySheets="..\..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\..\build\vs\pjproject-vs8-wm2003-release-defaults.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- ExecutionBucket="7"
- AdditionalIncludeDirectories="../..;../../g7221/common;../../../pjlib/include"
- PreprocessorDefinitions="_LIB;"
- PrecompiledHeaderFile=""
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\$(ProjectName)-$(TargetCPU)-wm2003ppc-vc$(VSVer)-$(ConfigurationName).lib"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCCodeSignTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- <DeploymentTool
- ForceDirty="-1"
- RemoteDirectory=""
- RegisterOutput="0"
- AdditionalFiles=""
- />
- <DebuggerTool
- />
- </Configuration>
- <Configuration
- Name="Release-Dynamic|Smartphone 2003 (ARMV4)"
- ConfigurationType="4"
- InheritedPropertySheets="..\..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\..\build\vs\pjproject-vs8-wm2003-release-defaults.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- ExecutionBucket="7"
- AdditionalIncludeDirectories="../..;../../g7221/common;../../../pjlib/include"
- PreprocessorDefinitions="_LIB;"
- PrecompiledHeaderFile=""
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\$(ProjectName)-$(TargetCPU)-wm2003sp-vc$(VSVer)-$(ConfigurationName).lib"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCCodeSignTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- <DeploymentTool
- ForceDirty="-1"
- RemoteDirectory=""
- RegisterOutput="0"
- AdditionalFiles=""
- />
- <DebuggerTool
- />
- </Configuration>
- <Configuration
- Name="Release-Dynamic|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
- ConfigurationType="4"
- InheritedPropertySheets="..\..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\..\build\vs\pjproject-vs8-wm5-release-defaults.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- ExecutionBucket="7"
- AdditionalIncludeDirectories="../..;../../g7221/common;../../../pjlib/include"
- PreprocessorDefinitions="_LIB;"
- PrecompiledHeaderFile=""
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\$(ProjectName)-$(TargetCPU)-wm5ppc-vc$(VSVer)-$(ConfigurationName).lib"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCCodeSignTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- <DeploymentTool
- ForceDirty="-1"
- RemoteDirectory=""
- RegisterOutput="0"
- AdditionalFiles=""
- />
- <DebuggerTool
- />
- </Configuration>
- <Configuration
- Name="Release-Dynamic|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"
- ConfigurationType="4"
- InheritedPropertySheets="..\..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\..\build\vs\pjproject-vs8-wm5-release-defaults.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- ExecutionBucket="7"
- AdditionalIncludeDirectories="../..;../../g7221/common;../../../pjlib/include"
- PreprocessorDefinitions="_LIB;"
- PrecompiledHeaderFile=""
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\$(ProjectName)-$(TargetCPU)-wm5sp-vc$(VSVer)-$(ConfigurationName).lib"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCCodeSignTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- <DeploymentTool
- ForceDirty="-1"
- RemoteDirectory=""
- RegisterOutput="0"
- AdditionalFiles=""
- />
- <DebuggerTool
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <Filter
- Name="Source Files"
- Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
- >
- <Filter
- Name="common"
- >
- <File
- RelativePath="..\..\g7221\common\basic_op.c"
- >
- </File>
- <File
- RelativePath="..\..\g7221\common\basic_op.h"
- >
- </File>
- <File
- RelativePath="..\..\g7221\common\basic_op_i.h"
- >
- </File>
- <File
- RelativePath="..\..\g7221\common\common.c"
- >
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Windows Mobile 6 Standard SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Pocket PC 2003 (ARMV4)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Smartphone 2003 (ARMV4)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Windows Mobile 6 Standard SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Pocket PC 2003 (ARMV4)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Smartphone 2003 (ARMV4)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug-Static|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug-Static|Windows Mobile 6 Standard SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug-Static|Windows Mobile 6 Professional SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug-Static|Pocket PC 2003 (ARMV4)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug-Static|Smartphone 2003 (ARMV4)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug-Static|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug-Static|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug-Dynamic|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug-Dynamic|Windows Mobile 6 Standard SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug-Dynamic|Windows Mobile 6 Professional SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug-Dynamic|Pocket PC 2003 (ARMV4)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug-Dynamic|Smartphone 2003 (ARMV4)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug-Dynamic|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug-Dynamic|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release-Static|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release-Static|Windows Mobile 6 Standard SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release-Static|Windows Mobile 6 Professional SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release-Static|Pocket PC 2003 (ARMV4)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release-Static|Smartphone 2003 (ARMV4)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release-Static|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release-Static|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release-Dynamic|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release-Dynamic|Windows Mobile 6 Standard SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release-Dynamic|Windows Mobile 6 Professional SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release-Dynamic|Pocket PC 2003 (ARMV4)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release-Dynamic|Smartphone 2003 (ARMV4)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release-Dynamic|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release-Dynamic|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\..\g7221\common\config.h"
- >
- </File>
- <File
- RelativePath="..\..\g7221\common\count.h"
- >
- </File>
- <File
- RelativePath="..\..\g7221\common\huff_def.h"
- >
- </File>
- <File
- RelativePath="..\..\g7221\common\huff_tab.c"
- >
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Windows Mobile 6 Standard SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Pocket PC 2003 (ARMV4)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Smartphone 2003 (ARMV4)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Windows Mobile 6 Standard SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Pocket PC 2003 (ARMV4)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Smartphone 2003 (ARMV4)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug-Static|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug-Static|Windows Mobile 6 Standard SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug-Static|Windows Mobile 6 Professional SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug-Static|Pocket PC 2003 (ARMV4)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug-Static|Smartphone 2003 (ARMV4)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug-Static|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug-Static|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug-Dynamic|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug-Dynamic|Windows Mobile 6 Standard SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug-Dynamic|Windows Mobile 6 Professional SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug-Dynamic|Pocket PC 2003 (ARMV4)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug-Dynamic|Smartphone 2003 (ARMV4)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug-Dynamic|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug-Dynamic|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release-Static|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release-Static|Windows Mobile 6 Standard SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release-Static|Windows Mobile 6 Professional SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release-Static|Pocket PC 2003 (ARMV4)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release-Static|Smartphone 2003 (ARMV4)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release-Static|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release-Static|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release-Dynamic|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release-Dynamic|Windows Mobile 6 Standard SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release-Dynamic|Windows Mobile 6 Professional SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release-Dynamic|Pocket PC 2003 (ARMV4)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release-Dynamic|Smartphone 2003 (ARMV4)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release-Dynamic|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release-Dynamic|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\..\g7221\common\huff_tab.h"
- >
- </File>
- <File
- RelativePath="..\..\g7221\common\tables.c"
- >
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Windows Mobile 6 Standard SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Pocket PC 2003 (ARMV4)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Smartphone 2003 (ARMV4)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Windows Mobile 6 Standard SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Pocket PC 2003 (ARMV4)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Smartphone 2003 (ARMV4)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug-Static|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug-Static|Windows Mobile 6 Standard SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug-Static|Windows Mobile 6 Professional SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug-Static|Pocket PC 2003 (ARMV4)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug-Static|Smartphone 2003 (ARMV4)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug-Static|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug-Static|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug-Dynamic|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug-Dynamic|Windows Mobile 6 Standard SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug-Dynamic|Windows Mobile 6 Professional SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug-Dynamic|Pocket PC 2003 (ARMV4)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug-Dynamic|Smartphone 2003 (ARMV4)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug-Dynamic|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug-Dynamic|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release-Static|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release-Static|Windows Mobile 6 Standard SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release-Static|Windows Mobile 6 Professional SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release-Static|Pocket PC 2003 (ARMV4)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release-Static|Smartphone 2003 (ARMV4)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release-Static|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release-Static|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release-Dynamic|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release-Dynamic|Windows Mobile 6 Standard SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release-Dynamic|Windows Mobile 6 Professional SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release-Dynamic|Pocket PC 2003 (ARMV4)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release-Dynamic|Smartphone 2003 (ARMV4)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release-Dynamic|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release-Dynamic|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\..\g7221\common\tables.h"
- >
- </File>
- <File
- RelativePath="..\..\g7221\common\typedef.h"
- >
- </File>
- </Filter>
- <Filter
- Name="decode"
- >
- <File
- RelativePath="..\..\g7221\decode\coef2sam.c"
- >
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Windows Mobile 6 Standard SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Pocket PC 2003 (ARMV4)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Smartphone 2003 (ARMV4)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Windows Mobile 6 Standard SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Pocket PC 2003 (ARMV4)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Smartphone 2003 (ARMV4)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug-Static|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug-Static|Windows Mobile 6 Standard SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug-Static|Windows Mobile 6 Professional SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug-Static|Pocket PC 2003 (ARMV4)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug-Static|Smartphone 2003 (ARMV4)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug-Static|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug-Static|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug-Dynamic|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug-Dynamic|Windows Mobile 6 Standard SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug-Dynamic|Windows Mobile 6 Professional SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug-Dynamic|Pocket PC 2003 (ARMV4)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug-Dynamic|Smartphone 2003 (ARMV4)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug-Dynamic|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug-Dynamic|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release-Static|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release-Static|Windows Mobile 6 Standard SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release-Static|Windows Mobile 6 Professional SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release-Static|Pocket PC 2003 (ARMV4)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release-Static|Smartphone 2003 (ARMV4)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release-Static|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release-Static|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release-Dynamic|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release-Dynamic|Windows Mobile 6 Standard SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release-Dynamic|Windows Mobile 6 Professional SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release-Dynamic|Pocket PC 2003 (ARMV4)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release-Dynamic|Smartphone 2003 (ARMV4)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release-Dynamic|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release-Dynamic|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\..\g7221\decode\dct4_s.c"
- >
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Windows Mobile 6 Standard SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Pocket PC 2003 (ARMV4)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Smartphone 2003 (ARMV4)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Windows Mobile 6 Standard SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Pocket PC 2003 (ARMV4)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Smartphone 2003 (ARMV4)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug-Static|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug-Static|Windows Mobile 6 Standard SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug-Static|Windows Mobile 6 Professional SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug-Static|Pocket PC 2003 (ARMV4)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug-Static|Smartphone 2003 (ARMV4)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug-Static|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug-Static|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug-Dynamic|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug-Dynamic|Windows Mobile 6 Standard SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug-Dynamic|Windows Mobile 6 Professional SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug-Dynamic|Pocket PC 2003 (ARMV4)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug-Dynamic|Smartphone 2003 (ARMV4)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug-Dynamic|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug-Dynamic|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release-Static|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release-Static|Windows Mobile 6 Standard SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release-Static|Windows Mobile 6 Professional SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release-Static|Pocket PC 2003 (ARMV4)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release-Static|Smartphone 2003 (ARMV4)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release-Static|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release-Static|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release-Dynamic|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release-Dynamic|Windows Mobile 6 Standard SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release-Dynamic|Windows Mobile 6 Professional SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release-Dynamic|Pocket PC 2003 (ARMV4)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release-Dynamic|Smartphone 2003 (ARMV4)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release-Dynamic|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release-Dynamic|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\..\g7221\decode\dct4_s.h"
- >
- </File>
- <File
- RelativePath="..\..\g7221\decode\decoder.c"
- >
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Windows Mobile 6 Standard SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Pocket PC 2003 (ARMV4)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Smartphone 2003 (ARMV4)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Windows Mobile 6 Standard SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Pocket PC 2003 (ARMV4)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Smartphone 2003 (ARMV4)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug-Static|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug-Static|Windows Mobile 6 Standard SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug-Static|Windows Mobile 6 Professional SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug-Static|Pocket PC 2003 (ARMV4)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug-Static|Smartphone 2003 (ARMV4)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug-Static|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug-Static|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug-Dynamic|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug-Dynamic|Windows Mobile 6 Standard SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug-Dynamic|Windows Mobile 6 Professional SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug-Dynamic|Pocket PC 2003 (ARMV4)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug-Dynamic|Smartphone 2003 (ARMV4)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug-Dynamic|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug-Dynamic|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release-Static|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release-Static|Windows Mobile 6 Standard SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release-Static|Windows Mobile 6 Professional SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release-Static|Pocket PC 2003 (ARMV4)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release-Static|Smartphone 2003 (ARMV4)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release-Static|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release-Static|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release-Dynamic|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release-Dynamic|Windows Mobile 6 Standard SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release-Dynamic|Windows Mobile 6 Professional SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release-Dynamic|Pocket PC 2003 (ARMV4)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release-Dynamic|Smartphone 2003 (ARMV4)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release-Dynamic|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release-Dynamic|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- </File>
- </Filter>
- <Filter
- Name="encode"
- >
- <File
- RelativePath="..\..\g7221\encode\dct4_a.c"
- >
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Windows Mobile 6 Standard SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Pocket PC 2003 (ARMV4)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Smartphone 2003 (ARMV4)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Windows Mobile 6 Standard SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Pocket PC 2003 (ARMV4)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Smartphone 2003 (ARMV4)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug-Static|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug-Static|Windows Mobile 6 Standard SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug-Static|Windows Mobile 6 Professional SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug-Static|Pocket PC 2003 (ARMV4)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug-Static|Smartphone 2003 (ARMV4)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug-Static|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug-Static|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug-Dynamic|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug-Dynamic|Windows Mobile 6 Standard SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug-Dynamic|Windows Mobile 6 Professional SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug-Dynamic|Pocket PC 2003 (ARMV4)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug-Dynamic|Smartphone 2003 (ARMV4)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug-Dynamic|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug-Dynamic|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release-Static|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release-Static|Windows Mobile 6 Standard SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release-Static|Windows Mobile 6 Professional SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release-Static|Pocket PC 2003 (ARMV4)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release-Static|Smartphone 2003 (ARMV4)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release-Static|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release-Static|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release-Dynamic|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release-Dynamic|Windows Mobile 6 Standard SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release-Dynamic|Windows Mobile 6 Professional SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release-Dynamic|Pocket PC 2003 (ARMV4)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release-Dynamic|Smartphone 2003 (ARMV4)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release-Dynamic|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release-Dynamic|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\..\g7221\encode\dct4_a.h"
- >
- </File>
- <File
- RelativePath="..\..\g7221\encode\encoder.c"
- >
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Windows Mobile 6 Standard SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Pocket PC 2003 (ARMV4)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Smartphone 2003 (ARMV4)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Windows Mobile 6 Standard SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Pocket PC 2003 (ARMV4)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Smartphone 2003 (ARMV4)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug-Static|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug-Static|Windows Mobile 6 Standard SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug-Static|Windows Mobile 6 Professional SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug-Static|Pocket PC 2003 (ARMV4)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug-Static|Smartphone 2003 (ARMV4)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug-Static|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug-Static|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug-Dynamic|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug-Dynamic|Windows Mobile 6 Standard SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug-Dynamic|Windows Mobile 6 Professional SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug-Dynamic|Pocket PC 2003 (ARMV4)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug-Dynamic|Smartphone 2003 (ARMV4)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug-Dynamic|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug-Dynamic|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release-Static|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release-Static|Windows Mobile 6 Standard SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release-Static|Windows Mobile 6 Professional SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release-Static|Pocket PC 2003 (ARMV4)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release-Static|Smartphone 2003 (ARMV4)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release-Static|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release-Static|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release-Dynamic|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release-Dynamic|Windows Mobile 6 Standard SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release-Dynamic|Windows Mobile 6 Professional SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release-Dynamic|Pocket PC 2003 (ARMV4)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release-Dynamic|Smartphone 2003 (ARMV4)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release-Dynamic|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release-Dynamic|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\..\g7221\encode\sam2coef.c"
- >
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Windows Mobile 6 Standard SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Pocket PC 2003 (ARMV4)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Smartphone 2003 (ARMV4)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Windows Mobile 6 Standard SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Pocket PC 2003 (ARMV4)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Smartphone 2003 (ARMV4)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug-Static|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug-Static|Windows Mobile 6 Standard SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug-Static|Windows Mobile 6 Professional SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug-Static|Pocket PC 2003 (ARMV4)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug-Static|Smartphone 2003 (ARMV4)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug-Static|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug-Static|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug-Dynamic|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug-Dynamic|Windows Mobile 6 Standard SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug-Dynamic|Windows Mobile 6 Professional SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug-Dynamic|Pocket PC 2003 (ARMV4)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug-Dynamic|Smartphone 2003 (ARMV4)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug-Dynamic|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug-Dynamic|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release-Static|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release-Static|Windows Mobile 6 Standard SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release-Static|Windows Mobile 6 Professional SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release-Static|Pocket PC 2003 (ARMV4)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release-Static|Smartphone 2003 (ARMV4)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release-Static|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release-Static|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release-Dynamic|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release-Dynamic|Windows Mobile 6 Standard SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release-Dynamic|Windows Mobile 6 Professional SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release-Dynamic|Pocket PC 2003 (ARMV4)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release-Dynamic|Smartphone 2003 (ARMV4)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release-Dynamic|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release-Dynamic|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- </File>
- </Filter>
- </Filter>
- <Filter
- Name="Header Files"
- Filter="h;hpp;hxx;hm;inl"
- >
- <File
- RelativePath="..\..\g7221\common\defs.h"
- >
- </File>
- </Filter>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
diff --git a/sflphone-common/libs/pjproject/third_party/g7221/common/basic_op.c b/sflphone-common/libs/pjproject/third_party/g7221/common/basic_op.c
deleted file mode 100644
index 028d06fe96ccc6de55fdc05ca9780a1121f4139e..0000000000000000000000000000000000000000
--- a/sflphone-common/libs/pjproject/third_party/g7221/common/basic_op.c
+++ /dev/null
@@ -1,1835 +0,0 @@
-#include "config.h"
-
-#if !PJMEDIA_LIBG7221_FUNCS_INLINED || \
- (PJMEDIA_LIBG7221_FUNCS_INLINED && defined(__BASIC_OP_H__))
-
-/*___________________________________________________________________________
- | |
- | Basic arithmetic operators. |
- |___________________________________________________________________________|
-*/
-
-/*___________________________________________________________________________
- | |
- | Include-Files |
- |___________________________________________________________________________|
-*/
-
-//#include <stdio.h>
-//#include <stdlib.h>
-#include "typedef.h"
-#include "basic_op.h"
-#include <pj/assert.h>
-
-#if (WMOPS)
-#include "count.h"
-extern BASIC_OP multiCounter[MAXCOUNTERS];
-extern int currCounter;
-
-#endif
-
-/*___________________________________________________________________________
- | |
- | Constants and Globals |
- |___________________________________________________________________________|
-*/
-#if INCLUDE_UNSAFE
-Flag g7221_Overflow = 0;
-Flag g7221_Carry = 0;
-#endif
-
-/*___________________________________________________________________________
- | |
- | Functions |
- |___________________________________________________________________________|
-*/
-/*___________________________________________________________________________
- | |
- | Function Name : shr |
- | |
- | Purpose : |
- | |
- | Arithmetically shift the 16 bit input var1 right var2 positions with |
- | sign extension. If var2 is negative, arithmetically shift var1 left by |
- | -var2 with sign extension. Saturate the result in case of underflows or |
- | overflows. |
- | |
- | Complexity weight : 1 |
- | |
- | Inputs : |
- | |
- | var1 |
- | 16 bit short signed integer (Word16) whose value falls in the |
- | range : 0xffff 8000 <= var1 <= 0x0000 7fff. |
- | |
- | var2 |
- | 16 bit short signed integer (Word16) whose value falls in the |
- | range : 0xffff 8000 <= var1 <= 0x0000 7fff. |
- | |
- | Outputs : |
- | |
- | none |
- | |
- | Return Value : |
- | |
- | var_out |
- | 16 bit short signed integer (Word16) whose value falls in the |
- | range : 0xffff 8000 <= var_out <= 0x0000 7fff. |
- |___________________________________________________________________________|
-*/
-LIBG7221_DEF(Word16) shr (Word16 var1, Word16 var2)
-{
- if (var2 < 0)
- {
- if (var2 < -16)
- var2 = -16;
- return shl_nocheck(var1, (Word16) -var2);
- }
- else
- {
- return shr_nocheck(var1, var2);
- }
-}
-/* ------------------------- End of shr() ------------------------- */
-
-
-/*___________________________________________________________________________
- | |
- | Function Name : shl |
- | |
- | Purpose : |
- | |
- | Arithmetically shift the 16 bit input var1 left var2 positions.Zero fill|
- | the var2 LSB of the result. If var2 is negative, arithmetically shift |
- | var1 right by -var2 with sign extension. Saturate the result in case of |
- | underflows or overflows. |
- | |
- | Complexity weight : 1 |
- | |
- | Inputs : |
- | |
- | var1 |
- | 16 bit short signed integer (Word16) whose value falls in the |
- | range : 0xffff 8000 <= var1 <= 0x0000 7fff. |
- | |
- | var2 |
- | 16 bit short signed integer (Word16) whose value falls in the |
- | range : 0xffff 8000 <= var1 <= 0x0000 7fff. |
- | |
- | Outputs : |
- | |
- | none |
- | |
- | Return Value : |
- | |
- | var_out |
- | 16 bit short signed integer (Word16) whose value falls in the |
- | range : 0xffff 8000 <= var_out <= 0x0000 7fff. |
- |___________________________________________________________________________|
-*/
-LIBG7221_DEF(Word16) shl (Word16 var1, Word16 var2)
-{
- if (var2 < 0)
- {
- return shr_nocheck(var1, (Word16) -var2);
- }
- else
- {
- return shl_nocheck(var1, var2);
- }
-}
-/* ------------------------- End of shl() ------------------------- */
-
-
-
-/*___________________________________________________________________________
- | |
- | Function Name : mult |
- | |
- | Purpose : |
- | |
- | Performs the multiplication of var1 by var2 and gives a 16 bit result |
- | which is scaled i.e.: |
- | mult(var1,var2) = extract_l(L_shr((var1 times var2),15)) and |
- | mult(-32768,-32768) = 32767. |
- | |
- | Complexity weight : 1 |
- | |
- | Inputs : |
- | |
- | var1 |
- | 16 bit short signed integer (Word16) whose value falls in the |
- | range : 0xffff 8000 <= var1 <= 0x0000 7fff. |
- | |
- | var2 |
- | 16 bit short signed integer (Word16) whose value falls in the |
- | range : 0xffff 8000 <= var1 <= 0x0000 7fff. |
- | |
- | Outputs : |
- | |
- | none |
- | |
- | Return Value : |
- | |
- | var_out |
- | 16 bit short signed integer (Word16) whose value falls in the |
- | range : 0xffff 8000 <= var_out <= 0x0000 7fff. |
- |___________________________________________________________________________|
-*/
-LIBG7221_DEF(Word16) mult (Word16 var1, Word16 var2)
-{
- Word16 var_out;
- Word32 L_product;
-
- L_product = (Word32) var1 *(Word32) var2;
-
- L_product = (L_product & (Word32) 0xffff8000L) >> 15;
-
- if (L_product & (Word32) 0x00010000L)
- L_product = L_product | (Word32) 0xffff0000L;
-
- var_out = saturate (L_product);
-#if (WMOPS)
- multiCounter[currCounter].mult++;
-#endif
- return (var_out);
-}
-/* ------------------------- End of mult() ------------------------- */
-
-
-/*___________________________________________________________________________
- | |
- | Function Name : L_msu |
- | |
- | Purpose : |
- | |
- | Multiply var1 by var2 and shift the result left by 1. Subtract the 32 |
- | bit result to L_var3 with saturation, return a 32 bit result: |
- | L_msu(L_var3,var1,var2) = L_sub(L_var3,L_mult(var1,var2)). |
- | |
- | Complexity weight : 1 |
- | |
- | Inputs : |
- | |
- | L_var3 32 bit long signed integer (Word32) whose value falls in the |
- | range : 0x8000 0000 <= L_var3 <= 0x7fff ffff. |
- | |
- | var1 |
- | 16 bit short signed integer (Word16) whose value falls in the |
- | range : 0xffff 8000 <= var1 <= 0x0000 7fff. |
- | |
- | var2 |
- | 16 bit short signed integer (Word16) whose value falls in the |
- | range : 0xffff 8000 <= var1 <= 0x0000 7fff. |
- | |
- | Outputs : |
- | |
- | none |
- | |
- | Return Value : |
- | |
- | L_var_out |
- | 32 bit long signed integer (Word32) whose value falls in the |
- | range : 0x8000 0000 <= L_var_out <= 0x7fff ffff. |
- |___________________________________________________________________________|
-*/
-LIBG7221_DEF(Word32) L_msu (Word32 L_var3, Word16 var1, Word16 var2)
-{
- Word32 L_var_out;
- Word32 L_product;
-
- L_product = L_mult (var1, var2);
-#if (WMOPS)
- multiCounter[currCounter].L_mult--;
-#endif
- L_var_out = L_sub (L_var3, L_product);
-#if (WMOPS)
- multiCounter[currCounter].L_sub--;
- multiCounter[currCounter].L_msu++;
-#endif
- return (L_var_out);
-}
-/* ------------------------- End of L_msu() ------------------------- */
-
-#if INCLUDE_UNSAFE
-/*___________________________________________________________________________
- | |
- | Function Name : L_macNs |
- | |
- | Purpose : |
- | |
- | Multiply var1 by var2 and shift the result left by 1. Add the 32 bit |
- | result to L_var3 without saturation, return a 32 bit result. Generate |
- | carry and overflow values : |
- | L_macNs(L_var3,var1,var2) = L_add_c(L_var3,L_mult(var1,var2)). |
- | |
- | Complexity weight : 1 |
- | |
- | Inputs : |
- | |
- | L_var3 32 bit long signed integer (Word32) whose value falls in the |
- | range : 0x8000 0000 <= L_var3 <= 0x7fff ffff. |
- | |
- | var1 |
- | 16 bit short signed integer (Word16) whose value falls in the |
- | range : 0xffff 8000 <= var1 <= 0x0000 7fff. |
- | |
- | var2 |
- | 16 bit short signed integer (Word16) whose value falls in the |
- | range : 0xffff 8000 <= var1 <= 0x0000 7fff. |
- | |
- | Outputs : |
- | |
- | none |
- | |
- | Return Value : |
- | |
- | L_var_out |
- | 32 bit long signed integer (Word32) whose value falls in the |
- | range : 0x8000 0000 <= L_var_out <= 0x7fff ffff. |
- | |
- | Caution : |
- | |
- | In some cases the Carry flag has to be cleared or set before using |
- | operators which take into account its value. |
- |___________________________________________________________________________|
-*/
-LIBG7221_DEF(Word32) L_macNs (Word32 L_var3, Word16 var1, Word16 var2)
-{
- Word32 L_var_out;
-
- L_var_out = L_mult (var1, var2);
-#if (WMOPS)
- multiCounter[currCounter].L_mult--;
-#endif
- L_var_out = L_add_c (L_var3, L_var_out);
-#if (WMOPS)
- multiCounter[currCounter].L_add_c--;
- multiCounter[currCounter].L_macNs++;
-#endif
- return (L_var_out);
-}
-#endif
-/* ------------------------- End of L_macNs() ------------------------- */
-
-#if INCLUDE_UNSAFE
-/*___________________________________________________________________________
- | |
- | Function Name : L_msuNs |
- | |
- | Purpose : |
- | |
- | Multiply var1 by var2 and shift the result left by 1. Subtract the 32 |
- | bit result from L_var3 without saturation, return a 32 bit result. Ge- |
- | nerate carry and overflow values : |
- | L_msuNs(L_var3,var1,var2) = L_sub_c(L_var3,L_mult(var1,var2)). |
- | |
- | Complexity weight : 1 |
- | |
- | Inputs : |
- | |
- | L_var3 32 bit long signed integer (Word32) whose value falls in the |
- | range : 0x8000 0000 <= L_var3 <= 0x7fff ffff. |
- | |
- | var1 |
- | 16 bit short signed integer (Word16) whose value falls in the |
- | range : 0xffff 8000 <= var1 <= 0x0000 7fff. |
- | |
- | var2 |
- | 16 bit short signed integer (Word16) whose value falls in the |
- | range : 0xffff 8000 <= var1 <= 0x0000 7fff. |
- | |
- | Outputs : |
- | |
- | none |
- | |
- | Return Value : |
- | |
- | L_var_out |
- | 32 bit long signed integer (Word32) whose value falls in the |
- | range : 0x8000 0000 <= L_var_out <= 0x7fff ffff. |
- | |
- | Caution : |
- | |
- | In some cases the Carry flag has to be cleared or set before using |
- | operators which take into account its value. |
- |___________________________________________________________________________|
-*/
-LIBG7221_DEF(Word32) L_msuNs (Word32 L_var3, Word16 var1, Word16 var2)
-{
- Word32 L_var_out;
-
- L_var_out = L_mult (var1, var2);
-#if (WMOPS)
- multiCounter[currCounter].L_mult--;
-#endif
- L_var_out = L_sub_c (L_var3, L_var_out);
-#if (WMOPS)
- multiCounter[currCounter].L_sub_c--;
- multiCounter[currCounter].L_msuNs++;
-#endif
- return (L_var_out);
-}
-#endif
-
-/* ------------------------- End of L_msuNs() ------------------------- */
-
-
-#if INCLUDE_UNSAFE
-/*___________________________________________________________________________
- | |
- | Function Name : L_add_c |
- | |
- | Purpose : |
- | |
- | Performs 32 bits addition of the two 32 bits variables (L_var1+L_var2+C)|
- | with carry. No saturation. Generate carry and Overflow values. The car- |
- | ry and overflow values are binary variables which can be tested and as- |
- | signed values. |
- | |
- | Complexity weight : 2 |
- | |
- | Inputs : |
- | |
- | L_var1 32 bit long signed integer (Word32) whose value falls in the |
- | range : 0x8000 0000 <= L_var3 <= 0x7fff ffff. |
- | |
- | L_var2 32 bit long signed integer (Word32) whose value falls in the |
- | range : 0x8000 0000 <= L_var3 <= 0x7fff ffff. |
- | |
- | Outputs : |
- | |
- | none |
- | |
- | Return Value : |
- | |
- | L_var_out |
- | 32 bit long signed integer (Word32) whose value falls in the |
- | range : 0x8000 0000 <= L_var_out <= 0x7fff ffff. |
- | |
- | Caution : |
- | |
- | In some cases the Carry flag has to be cleared or set before using |
- | operators which take into account its value. |
- |___________________________________________________________________________|
-*/
-LIBG7221_DEF(Word32) L_add_c (Word32 L_var1, Word32 L_var2)
-{
- Word32 L_var_out;
- Word32 L_test;
- Flag carry_int = 0;
-
- L_var_out = L_var1 + L_var2 + GET_CARRY();
-
- L_test = L_var1 + L_var2;
-
- if ((L_var1 > 0) && (L_var2 > 0) && (L_test < 0))
- {
- SET_OVERFLOW(1);
- carry_int = 0;
- }
- else
- {
- if ((L_var1 < 0) && (L_var2 < 0))
- {
- if (L_test >= 0)
- {
- SET_OVERFLOW(1);
- carry_int = 1;
- }
- else
- {
- SET_OVERFLOW(0);
- carry_int = 1;
- }
- }
- else
- {
- if (((L_var1 ^ L_var2) < 0) && (L_test >= 0))
- {
- SET_OVERFLOW(0);
- carry_int = 1;
- }
- else
- {
- SET_OVERFLOW(0);
- carry_int = 0;
- }
- }
- }
-
- if (GET_CARRY())
- {
- if (L_test == MAX_32)
- {
- SET_OVERFLOW(1);
- SET_CARRY(carry_int);
- }
- else
- {
- if (L_test == (Word32) 0xFFFFFFFFL)
- {
- SET_CARRY(1);
- }
- else
- {
- SET_CARRY(carry_int);
- }
- }
- }
- else
- {
- SET_CARRY(carry_int);
- }
-
-#if (WMOPS)
- multiCounter[currCounter].L_add_c++;
-#endif
- return (L_var_out);
-}
-#endif
-
-/* ------------------------- End of L_add_c() ------------------------- */
-
-#if INCLUDE_UNSAFE
-/*___________________________________________________________________________
- | |
- | Function Name : L_sub_c |
- | |
- | Purpose : |
- | |
- | Performs 32 bits subtraction of the two 32 bits variables with carry |
- | (borrow) : L_var1-L_var2-C. No saturation. Generate carry and Overflow |
- | values. The carry and overflow values are binary variables which can |
- | be tested and assigned values. |
- | |
- | Complexity weight : 2 |
- | |
- | Inputs : |
- | |
- | L_var1 32 bit long signed integer (Word32) whose value falls in the |
- | range : 0x8000 0000 <= L_var3 <= 0x7fff ffff. |
- | |
- | L_var2 32 bit long signed integer (Word32) whose value falls in the |
- | range : 0x8000 0000 <= L_var3 <= 0x7fff ffff. |
- | |
- | Outputs : |
- | |
- | none |
- | |
- | Return Value : |
- | |
- | L_var_out |
- | 32 bit long signed integer (Word32) whose value falls in the |
- | range : 0x8000 0000 <= L_var_out <= 0x7fff ffff. |
- | |
- | Caution : |
- | |
- | In some cases the Carry flag has to be cleared or set before using |
- | operators which take into account its value. |
- |___________________________________________________________________________|
-*/
-LIBG7221_DEF(Word32) L_sub_c (Word32 L_var1, Word32 L_var2)
-{
- Word32 L_var_out;
- Word32 L_test;
- Flag carry_int = 0;
-
- if (GET_CARRY())
- {
- SET_CARRY(0);
- if (L_var2 != MIN_32)
- {
- L_var_out = L_add_c (L_var1, -L_var2);
-#if (WMOPS)
- multiCounter[currCounter].L_add_c--;
-#endif
- }
- else
- {
- L_var_out = L_var1 - L_var2;
- if (L_var1 > 0L)
- {
- SET_OVERFLOW(1);
- SET_CARRY(0);
- }
- }
- }
- else
- {
- L_var_out = L_var1 - L_var2 - (Word32) 0X00000001L;
- L_test = L_var1 - L_var2;
-
- if ((L_test < 0) && (L_var1 > 0) && (L_var2 < 0))
- {
- SET_OVERFLOW(1);
- carry_int = 0;
- }
- else if ((L_test > 0) && (L_var1 < 0) && (L_var2 > 0))
- {
- SET_OVERFLOW(1);
- carry_int = 1;
- }
- else if ((L_test > 0) && ((L_var1 ^ L_var2) > 0))
- {
- SET_OVERFLOW(0);
- carry_int = 1;
- }
- if (L_test == MIN_32)
- {
- SET_OVERFLOW(1);
- SET_CARRY(carry_int);
- }
- else
- {
- SET_CARRY(carry_int);
- }
- }
-
-#if (WMOPS)
- multiCounter[currCounter].L_sub_c++;
-#endif
- return (L_var_out);
-}
-#endif
-/* ------------------------- End of L_sub_c() ------------------------- */
-
-
-/*___________________________________________________________________________
- | |
- | Function Name : L_negate |
- | |
- | Purpose : |
- | |
- | Negate the 32 bit variable L_var1 with saturation; saturate in the case |
- | where input is -2147483648 (0x8000 0000). |
- | |
- | Complexity weight : 2 |
- | |
- | Inputs : |
- | |
- | L_var1 32 bit long signed integer (Word32) whose value falls in the |
- | range : 0x8000 0000 <= L_var3 <= 0x7fff ffff. |
- | |
- | Outputs : |
- | |
- | none |
- | |
- | Return Value : |
- | |
- | L_var_out |
- | 32 bit long signed integer (Word32) whose value falls in the |
- | range : 0x8000 0000 <= L_var_out <= 0x7fff ffff. |
- |___________________________________________________________________________|
-*/
-LIBG7221_DEF(Word32) L_negate (Word32 L_var1)
-{
- Word32 L_var_out;
-
- L_var_out = (L_var1 == MIN_32) ? MAX_32 : -L_var1;
-#if (WMOPS)
- multiCounter[currCounter].L_negate++;
-#endif
- return (L_var_out);
-}
-/* ------------------------- End of L_negate() ------------------------- */
-
-
-/*___________________________________________________________________________
- | |
- | Function Name : mult_r |
- | |
- | Purpose : |
- | |
- | Same as mult with rounding, i.e.: |
- | mult_r(var1,var2) = extract_l(L_shr(((var1 * var2) + 16384),15)) and |
- | mult_r(-32768,-32768) = 32767. |
- | |
- | Complexity weight : 2 |
- | |
- | Inputs : |
- | |
- | var1 |
- | 16 bit short signed integer (Word16) whose value falls in the |
- | range : 0xffff 8000 <= var1 <= 0x0000 7fff. |
- | |
- | var2 |
- | 16 bit short signed integer (Word16) whose value falls in the |
- | range : 0xffff 8000 <= var1 <= 0x0000 7fff. |
- | |
- | Outputs : |
- | |
- | none |
- | |
- | Return Value : |
- | |
- | var_out |
- | 16 bit short signed integer (Word16) whose value falls in the |
- | range : 0xffff 8000 <= var_out <= 0x0000 7fff. |
- |___________________________________________________________________________|
-*/
-LIBG7221_DEF(Word16) mult_r (Word16 var1, Word16 var2)
-{
- Word16 var_out;
- Word32 L_product_arr;
-
- L_product_arr = (Word32) var1 *(Word32) var2; /* product */
- L_product_arr += (Word32) 0x00004000L; /* round */
- L_product_arr &= (Word32) 0xffff8000L;
- L_product_arr >>= 15; /* shift */
-
- if (L_product_arr & (Word32) 0x00010000L) /* sign extend when necessary */
- {
- L_product_arr |= (Word32) 0xffff0000L;
- }
- var_out = saturate (L_product_arr);
-#if (WMOPS)
- multiCounter[currCounter].mult_r++;
-#endif
- return (var_out);
-}
-/* ------------------------- End of mult_r() ------------------------- */
-
-
-
-/*___________________________________________________________________________
- | |
- | Function Name : shr_r |
- | |
- | Purpose : |
- | |
- | Same as shr(var1,var2) but with rounding. Saturate the result in case of|
- | underflows or overflows : |
- | - If var2 is greater than zero : |
- | if (sub(shl(shr(var1,var2),1),shr(var1,sub(var2,1)))) |
- | is equal to zero |
- | then |
- | shr_r(var1,var2) = shr(var1,var2) |
- | else |
- | shr_r(var1,var2) = add(shr(var1,var2),1) |
- | - If var2 is less than or equal to zero : |
- | shr_r(var1,var2) = shr(var1,var2). |
- | |
- | Complexity weight : 2 |
- | |
- | Inputs : |
- | |
- | var1 |
- | 16 bit short signed integer (Word16) whose value falls in the |
- | range : 0xffff 8000 <= var1 <= 0x0000 7fff. |
- | |
- | var2 |
- | 16 bit short signed integer (Word16) whose value falls in the |
- | range : 0xffff 8000 <= var1 <= 0x0000 7fff. |
- | |
- | Outputs : |
- | |
- | none |
- | |
- | Return Value : |
- | |
- | var_out |
- | 16 bit short signed integer (Word16) whose value falls in the |
- | range : 0xffff 8000 <= var_out <= 0x0000 7fff. |
- |___________________________________________________________________________|
-*/
-LIBG7221_DEF(Word16) shr_r (Word16 var1, Word16 var2)
-{
- Word16 var_out;
-
- if (var2 > 15)
- {
- var_out = 0;
- }
- else
- {
- var_out = shr (var1, var2);
-#if (WMOPS)
- multiCounter[currCounter].shr--;
-#endif
-
- if (var2 > 0)
- {
- if ((var1 & ((Word16) 1 << (var2 - 1))) != 0)
- {
- var_out++;
- }
- }
- }
-#if (WMOPS)
- multiCounter[currCounter].shr_r++;
-#endif
- return (var_out);
-}
-/* ------------------------- End of shr_r() ------------------------- */
-
-
-/*___________________________________________________________________________
- | |
- | Function Name : mac_r |
- | |
- | Purpose : |
- | |
- | Multiply var1 by var2 and shift the result left by 1. Add the 32 bit |
- | result to L_var3 with saturation. Round the LS 16 bits of the result |
- | into the MS 16 bits with saturation and shift the result right by 16. |
- | Return a 16 bit result. |
- | mac_r(L_var3,var1,var2) = round(L_mac(L_var3,var1,var2)) |
- | |
- | Complexity weight : 2 |
- | |
- | Inputs : |
- | |
- | L_var3 32 bit long signed integer (Word32) whose value falls in the |
- | range : 0x8000 0000 <= L_var3 <= 0x7fff ffff. |
- | |
- | var1 |
- | 16 bit short signed integer (Word16) whose value falls in the |
- | range : 0xffff 8000 <= var1 <= 0x0000 7fff. |
- | |
- | var2 |
- | 16 bit short signed integer (Word16) whose value falls in the |
- | range : 0xffff 8000 <= var1 <= 0x0000 7fff. |
- | |
- | Outputs : |
- | |
- | none |
- | |
- | Return Value : |
- | |
- | var_out |
- | 16 bit short signed integer (Word16) whose value falls in the |
- | range : 0x0000 8000 <= L_var_out <= 0x0000 7fff. |
- |___________________________________________________________________________|
-*/
-LIBG7221_DEF(Word16) mac_r (Word32 L_var3, Word16 var1, Word16 var2)
-{
- Word16 var_out;
-
- L_var3 = L_mac (L_var3, var1, var2);
-#if (WMOPS)
- multiCounter[currCounter].L_mac--;
-#endif
- L_var3 = L_add (L_var3, (Word32) 0x00008000L);
-#if (WMOPS)
- multiCounter[currCounter].L_add--;
-#endif
- var_out = extract_h (L_var3);
-#if (WMOPS)
- multiCounter[currCounter].extract_h--;
- multiCounter[currCounter].mac_r++;
-#endif
- return (var_out);
-}
-/* ------------------------- End of mac_r() ------------------------- */
-
-
-/*___________________________________________________________________________
- | |
- | Function Name : msu_r |
- | |
- | Purpose : |
- | |
- | Multiply var1 by var2 and shift the result left by 1. Subtract the 32 |
- | bit result to L_var3 with saturation. Round the LS 16 bits of the res- |
- | ult into the MS 16 bits with saturation and shift the result right by |
- | 16. Return a 16 bit result. |
- | msu_r(L_var3,var1,var2) = round(L_msu(L_var3,var1,var2)) |
- | |
- | Complexity weight : 2 |
- | |
- | Inputs : |
- | |
- | L_var3 32 bit long signed integer (Word32) whose value falls in the |
- | range : 0x8000 0000 <= L_var3 <= 0x7fff ffff. |
- | |
- | var1 |
- | 16 bit short signed integer (Word16) whose value falls in the |
- | range : 0xffff 8000 <= var1 <= 0x0000 7fff. |
- | |
- | var2 |
- | 16 bit short signed integer (Word16) whose value falls in the |
- | range : 0xffff 8000 <= var1 <= 0x0000 7fff. |
- | |
- | Outputs : |
- | |
- | none |
- | |
- | Return Value : |
- | |
- | var_out |
- | 16 bit short signed integer (Word16) whose value falls in the |
- | range : 0x0000 8000 <= L_var_out <= 0x0000 7fff. |
- |___________________________________________________________________________|
-*/
-LIBG7221_DEF(Word16) msu_r (Word32 L_var3, Word16 var1, Word16 var2)
-{
- Word16 var_out;
-
- L_var3 = L_msu (L_var3, var1, var2);
-#if (WMOPS)
- multiCounter[currCounter].L_msu--;
-#endif
- L_var3 = L_add (L_var3, (Word32) 0x00008000L);
-#if (WMOPS)
- multiCounter[currCounter].L_add--;
-#endif
- var_out = extract_h (L_var3);
-#if (WMOPS)
- multiCounter[currCounter].extract_h--;
- multiCounter[currCounter].msu_r++;
-#endif
- return (var_out);
-}
-/* ------------------------- End of msu_r() ------------------------- */
-
-
-/*___________________________________________________________________________
- | |
- | Function Name : L_deposit_h |
- | |
- | Purpose : |
- | |
- | Deposit the 16 bit var1 into the 16 MS bits of the 32 bit output. The |
- | 16 LS bits of the output are zeroed. |
- | |
- | Complexity weight : 2 |
- | |
- | Inputs : |
- | |
- | var1 |
- | 16 bit short signed integer (Word16) whose value falls in the |
- | range : 0xffff 8000 <= var1 <= 0x0000 7fff. |
- | |
- | Outputs : |
- | |
- | none |
- | |
- | Return Value : |
- | |
- | L_var_out |
- | 32 bit long signed integer (Word32) whose value falls in the |
- | range : 0x8000 0000 <= var_out <= 0x7fff 0000. |
- |___________________________________________________________________________|
-*/
-LIBG7221_DEF(Word32) L_deposit_h (Word16 var1)
-{
- Word32 L_var_out;
-
- L_var_out = (Word32) var1 << 16;
-#if (WMOPS)
- multiCounter[currCounter].L_deposit_h++;
-#endif
- return (L_var_out);
-}
-/* ------------------------- End of L_deposit_h() ------------------------- */
-
-
-/*___________________________________________________________________________
- | |
- | Function Name : L_deposit_l |
- | |
- | Purpose : |
- | |
- | Deposit the 16 bit var1 into the 16 LS bits of the 32 bit output. The |
- | 16 MS bits of the output are sign extended. |
- | |
- | Complexity weight : 2 |
- | |
- | Inputs : |
- | |
- | var1 |
- | 16 bit short signed integer (Word16) whose value falls in the |
- | range : 0xffff 8000 <= var1 <= 0x0000 7fff. |
- | |
- | Outputs : |
- | |
- | none |
- | |
- | Return Value : |
- | |
- | L_var_out |
- | 32 bit long signed integer (Word32) whose value falls in the |
- | range : 0xFFFF 8000 <= var_out <= 0x0000 7fff. |
- |___________________________________________________________________________|
-*/
-LIBG7221_DEF(Word32) L_deposit_l (Word16 var1)
-{
- Word32 L_var_out;
-
- L_var_out = (Word32) var1;
-#if (WMOPS)
- multiCounter[currCounter].L_deposit_l++;
-#endif
- return (L_var_out);
-}
-/* ------------------------- End of L_deposit_l() ------------------------- */
-
-
-/*___________________________________________________________________________
- | |
- | Function Name : L_shr_r |
- | |
- | Purpose : |
- | |
- | Same as L_shr(L_var1,var2) but with rounding. Saturate the result in |
- | case of underflows or overflows : |
- | - If var2 is greater than zero : |
- | if (L_sub(L_shl(L_shr(L_var1,var2),1),L_shr(L_var1,sub(var2,1))))|
- | is equal to zero |
- | then |
- | L_shr_r(L_var1,var2) = L_shr(L_var1,var2) |
- | else |
- | L_shr_r(L_var1,var2) = L_add(L_shr(L_var1,var2),1) |
- | - If var2 is less than or equal to zero : |
- | L_shr_r(L_var1,var2) = L_shr(L_var1,var2). |
- | |
- | Complexity weight : 3 |
- | |
- | Inputs : |
- | |
- | L_var1 |
- | 32 bit long signed integer (Word32) whose value falls in the |
- | range : 0x8000 0000 <= var1 <= 0x7fff ffff. |
- | |
- | var2 |
- | 16 bit short signed integer (Word16) whose value falls in the |
- | range : 0xffff 8000 <= var1 <= 0x0000 7fff. |
- | |
- | Outputs : |
- | |
- | none |
- | |
- | Return Value : |
- | |
- | L_var_out |
- | 32 bit long signed integer (Word32) whose value falls in the |
- | range : 0x8000 0000 <= var_out <= 0x7fff ffff. |
- |___________________________________________________________________________|
-*/
-LIBG7221_DEF(Word32) L_shr_r (Word32 L_var1, Word16 var2)
-{
- Word32 L_var_out;
-
- if (var2 > 31)
- {
- L_var_out = 0;
- }
- else
- {
- L_var_out = L_shr (L_var1, var2);
-#if (WMOPS)
- multiCounter[currCounter].L_shr--;
-#endif
- if (var2 > 0)
- {
- if ((L_var1 & ((Word32) 1 << (var2 - 1))) != 0)
- {
- L_var_out++;
- }
- }
- }
-#if (WMOPS)
- multiCounter[currCounter].L_shr_r++;
-#endif
- return (L_var_out);
-}
-/* ------------------------- End of L_shr_r() ------------------------- */
-
-
-/*___________________________________________________________________________
- | |
- | Function Name : L_abs |
- | |
- | Purpose : |
- | |
- | Absolute value of L_var1; Saturate in case where the input is |
- | -214783648 |
- | |
- | Complexity weight : 3 |
- | |
- | Inputs : |
- | |
- | L_var1 |
- | 32 bit long signed integer (Word32) whose value falls in the |
- | range : 0x8000 0000 <= var1 <= 0x7fff ffff. |
- | |
- | Outputs : |
- | |
- | none |
- | |
- | Return Value : |
- | |
- | L_var_out |
- | 32 bit long signed integer (Word32) whose value falls in the |
- | range : 0x0000 0000 <= var_out <= 0x7fff ffff. |
- |___________________________________________________________________________|
-*/
-LIBG7221_DEF(Word32) L_abs (Word32 L_var1)
-{
- Word32 L_var_out;
-
- if (L_var1 == MIN_32)
- {
- L_var_out = MAX_32;
- }
- else
- {
- if (L_var1 < 0)
- {
- L_var_out = -L_var1;
- }
- else
- {
- L_var_out = L_var1;
- }
- }
-
-#if (WMOPS)
- multiCounter[currCounter].L_abs++;
-#endif
- return (L_var_out);
-}
-/* ------------------------- End of L_abs() ------------------------- */
-
-
-/*___________________________________________________________________________
- | |
- | Function Name : norm_s |
- | |
- | Purpose : |
- | |
- | Produces the number of left shift needed to normalize the 16 bit varia- |
- | ble var1 for positive values on the interval with minimum of 16384 and |
- | maximum of 32767, and for negative values on the interval with minimum |
- | of -32768 and maximum of -16384; in order to normalize the result, the |
- | following operation must be done : |
- | norm_var1 = shl(var1,norm_s(var1)). |
- | |
- | Complexity weight : 15 |
- | |
- | Inputs : |
- | |
- | var1 |
- | 16 bit short signed integer (Word16) whose value falls in the |
- | range : 0xffff 8000 <= var1 <= 0x0000 7fff. |
- | |
- | Outputs : |
- | |
- | none |
- | |
- | Return Value : |
- | |
- | var_out |
- | 16 bit short signed integer (Word16) whose value falls in the |
- | range : 0x0000 0000 <= var_out <= 0x0000 000f. |
- |___________________________________________________________________________|
-*/
-LIBG7221_DEF(Word16) norm_s (Word16 var1)
-{
- Word16 var_out;
-
- if (var1 == 0)
- {
- var_out = 0;
- }
- else
- {
- if ((UWord16)var1 == (UWord16)0xffff)
- {
- var_out = 15;
- }
- else
- {
- if (var1 < 0)
- {
- var1 = (Word16)(~var1);
- }
- for (var_out = 0; var1 < 0x4000; var_out++)
- {
- var1 <<= 1;
- }
- }
- }
-
-#if (WMOPS)
- multiCounter[currCounter].norm_s++;
-#endif
- return (var_out);
-}
-/* ------------------------- End of norm_s() ------------------------- */
-
-
-/*___________________________________________________________________________
- | |
- | Function Name : div_s |
- | |
- | Purpose : |
- | |
- | Produces a result which is the fractional integer division of var1 by |
- | var2; var1 and var2 must be positive and var2 must be greater or equal |
- | to var1; the result is positive (leading bit equal to 0) and truncated |
- | to 16 bits. |
- | If var1 = var2 then div(var1,var2) = 32767. |
- | |
- | Complexity weight : 18 |
- | |
- | Inputs : |
- | |
- | var1 |
- | 16 bit short signed integer (Word16) whose value falls in the |
- | range : 0x0000 0000 <= var1 <= var2 and var2 != 0. |
- | |
- | var2 |
- | 16 bit short signed integer (Word16) whose value falls in the |
- | range : var1 <= var2 <= 0x0000 7fff and var2 != 0. |
- | |
- | Outputs : |
- | |
- | none |
- | |
- | Return Value : |
- | |
- | var_out |
- | 16 bit short signed integer (Word16) whose value falls in the |
- | range : 0x0000 0000 <= var_out <= 0x0000 7fff. |
- | It's a Q15 value (point between b15 and b14). |
- |___________________________________________________________________________|
-*/
-LIBG7221_DEF(Word16) div_s (Word16 var1, Word16 var2)
-{
- Word16 var_out = 0;
- Word16 iteration;
- Word32 L_num;
- Word32 L_denom;
-
- if ((var1 > var2) || (var1 < 0) || (var2 < 0))
- {
- //printf ("Division Error var1=%d var2=%d\n", var1, var2);
- //abort(); /* exit (0); */
- pj_assert(!"Division Error");
- }
- if (var2 == 0)
- {
- //printf ("Division by 0, Fatal error \n");
- //abort(); /* exit (0); */
- assert(!"Division by 0");
- }
- if (var1 == 0)
- {
- var_out = 0;
- }
- else
- {
- if (var1 == var2)
- {
- var_out = MAX_16;
- }
- else
- {
- L_num = L_deposit_l (var1);
-#if (WMOPS)
- multiCounter[currCounter].L_deposit_l--;
-#endif
- L_denom = L_deposit_l (var2);
-#if (WMOPS)
- multiCounter[currCounter].L_deposit_l--;
-#endif
-
- for (iteration = 0; iteration < 15; iteration++)
- {
- var_out <<= 1;
- L_num <<= 1;
-
- if (L_num >= L_denom)
- {
- L_num = L_sub (L_num, L_denom);
-#if (WMOPS)
- multiCounter[currCounter].L_sub--;
-#endif
- var_out = add (var_out, 1);
-#if (WMOPS)
- multiCounter[currCounter].add--;
-#endif
- }
- }
- }
- }
-
-#if (WMOPS)
- multiCounter[currCounter].div_s++;
-#endif
- return (var_out);
-}
-/* ------------------------- End of div_s() ------------------------- */
-
-
-/*___________________________________________________________________________
- | |
- | Function Name : norm_l |
- | |
- | Purpose : |
- | |
- | Produces the number of left shifts needed to normalize the 32 bit varia-|
- | ble L_var1 for positive values on the interval with minimum of |
- | 1073741824 and maximum of 2147483647, and for negative values on the in-|
- | terval with minimum of -2147483648 and maximum of -1073741824; in order |
- | to normalize the result, the following operation must be done : |
- | norm_L_var1 = L_shl(L_var1,norm_l(L_var1)). |
- | |
- | Complexity weight : 30 |
- | |
- | Inputs : |
- | |
- | L_var1 |
- | 32 bit long signed integer (Word32) whose value falls in the |
- | range : 0x8000 0000 <= var1 <= 0x7fff ffff. |
- | |
- | Outputs : |
- | |
- | none |
- | |
- | Return Value : |
- | |
- | var_out |
- | 16 bit short signed integer (Word16) whose value falls in the |
- | range : 0x0000 0000 <= var_out <= 0x0000 001f. |
- |___________________________________________________________________________|
-*/
-LIBG7221_DEF(Word16) norm_l (Word32 L_var1)
-{
- Word16 var_out;
-
- if (L_var1 == 0)
- {
- var_out = 0;
- }
- else
- {
- if (L_var1 == (Word32) 0xffffffffL)
- {
- var_out = 31;
- }
- else
- {
- if (L_var1 < 0)
- {
- L_var1 = ~L_var1;
- }
- for (var_out = 0; L_var1 < (Word32) 0x40000000L; var_out++)
- {
- L_var1 <<= 1;
- }
- }
- }
-
-#if (WMOPS)
- multiCounter[currCounter].norm_l++;
-#endif
- return (var_out);
-}
-/* ------------------------- End of norm_l() ------------------------- */
-
-
-/*
- *****************************************************************
- Additional operators extracted from the G.723.1 Library
- Adapted for WMOPS calculations
- *****************************************************************
-*/
-
-/*___________________________________________________________________________
- | |
- | Function Name : L_mls |
- | |
- | Purpose : |
- | |
- | Multiplies a 16 bit word v by a 32 bit word Lv and returns a 32 bit |
- | word (multiplying 16 by 32 bit words gives 48 bit word; the function |
- | extracts the 32 MSB and shift the result to the left by 1). |
- | |
- | A 32 bit word can be written as |
- | Lv = a + b * 2^16 |
- | where a= unsigned 16 LSBs and b= signed 16 MSBs. |
- | The function returns v * Lv / 2^15 which is equivalent to |
- | a*v / 2^15 + b*v*2 |
- | |
- | Complexity weight : 6 [to be confirmed] |
- | |
- | Inputs : |
- | |
- | Lv |
- | 32 bit long signed integer (Word32) whose value falls in the |
- | range : 0x8000 0000 <= var1 <= 0x7fff ffff. |
- | v |
- | 16 bit short signed integer (Word16) whose value falls in the |
- | range : 0x8000 <= var1 <= 0x7fff. |
- | |
- | Outputs : |
- | |
- | none |
- | |
- | Return Value : |
- | |
- | var_out |
- | 32 bit long signed integer (Word32) whose value falls in the |
- | range : 0x8000 0000 <= var_out <= 0x7fff ffff. |
- | |
- |___________________________________________________________________________|
-*/
-LIBG7221_DEF(Word32) L_mls (Word32 Lv, Word16 v)
-{
- Word32 Temp ;
-
- Temp = Lv & (Word32) 0x0000ffff ;
- Temp = Temp * (Word32) v ;
- Temp = L_shr_nocheck( Temp, (Word16) 15 ) ;
- Temp = L_mac( Temp, v, extract_h(Lv) ) ;
-
-#if (WMOPS)
- multiCounter[currCounter].L_shr--;
- multiCounter[currCounter].L_mac--;
- multiCounter[currCounter].extract_h--;
- multiCounter[currCounter].L_mls++;
-#endif
-
- return Temp ;
-}
-/* ------------------------- End of L_mls() ------------------------- */
-
-
-/*__________________________________________________________________________
-| |
-| Function Name : div_l |
-| |
-| Purpose : |
-| |
-| Produces a result which is the fractional integer division of L_var1 by|
-| var2; L_var1 and var2 must be positive and var2 << 16 must be greater or|
-| equal to L_var1; the result is positive (leading bit equal to 0) and |
-| truncated to 16 bits. |
-| If L_var1 == var2 << 16 then div_l(L_var1,var2) = 32767. |
-| |
-| Complexity weight : 20 |
-| |
-| Inputs : |
-| |
-| L_var1 |
-| 32 bit long signed integer (Word32) whose value falls in the |
-| range : 0x0000 0000 <= var1 <= (var2 << 16) and var2 != 0. |
-| L_var1 must be considered as a Q.31 value |
-| |
-| var2 |
-| 16 bit short signed integer (Word16) whose value falls in the |
-| range : var1 <= (var2<< 16) <= 0x7fff0000 and var2 != 0. |
-| var2 must be considered as a Q.15 value |
-| |
-| Outputs : |
-| |
-| none |
-| |
-| Return Value : |
-| |
-| var_out |
-| 16 bit short signed integer (Word16) whose value falls in the |
-| range : 0x0000 0000 <= var_out <= 0x0000 7fff. |
-| It's a Q15 value (point between b15 and b14). |
-|___________________________________________________________________________|
-*/
-LIBG7221_DEF(Word16) div_l (Word32 L_num, Word16 den)
-{
- Word16 var_out = (Word16)0;
- Word32 L_den;
- Word16 iteration;
-
-#if (WMOPS)
- multiCounter[currCounter].div_l++;
-#endif
-
- if ( den == (Word16) 0 ) {
- //printf("Division by 0 in div_l, Fatal error \n");
- //exit(0);
- assert(!"Division by 0");
- }
-
- if ( (L_num < (Word32) 0) || (den < (Word16) 0) ) {
- //printf("Division Error in div_l, Fatal error \n");
- //exit(0);
- assert(!"Division Error");
- }
-
- L_den = L_deposit_h( den ) ;
-#if (WMOPS)
- multiCounter[currCounter].L_deposit_h--;
-#endif
-
- if ( L_num >= L_den ){
- return MAX_16 ;
- }
- else {
- L_num = L_shr_nocheck(L_num, (Word16)1) ;
- L_den = L_shr_nocheck(L_den, (Word16)1);
-#if (WMOPS)
- multiCounter[currCounter].L_shr-=2;
-#endif
- for(iteration=(Word16)0; iteration< (Word16)15;iteration++) {
- var_out = shl_nocheck( var_out, (Word16)1);
- L_num = L_shl_nocheck( L_num, (Word16)1);
-#if (WMOPS)
- multiCounter[currCounter].shl--;
- multiCounter[currCounter].L_shl--;
-#endif
- if (L_num >= L_den) {
- L_num = L_sub(L_num,L_den);
- var_out = add(var_out, (Word16)1);
-#if (WMOPS)
- multiCounter[currCounter].L_sub--;
- multiCounter[currCounter].add--;
-#endif
- }
- }
-
- return var_out;
- }
-}
-/* ------------------------- End of div_l() ------------------------- */
-
-
-/*__________________________________________________________________________
-| |
-| Function Name : i_mult |
-| |
-| Purpose : |
-| |
-| Integer 16-bit multiplication. No overflow protection is performed if |
-| ORIGINAL_G7231 is defined. |
-| |
-| Complexity weight : TBD |
-| |
-| Inputs : |
-| |
-| a |
-| 16 bit short signed integer (Word16). |
-| |
-| b |
-| 16 bit short signed integer (Word16). |
-| |
-| Outputs : |
-| |
-| none |
-| |
-| Return Value : |
-| |
-| 16 bit short signed integer (Word16). No overflow checks |
-| are performed if ORIGINAL_G7231 is defined. |
-|___________________________________________________________________________|
-*/
-LIBG7221_DEF(Word16) i_mult (Word16 a, Word16 b)
-{
-#ifdef ORIGINAL_G7231
- return a*b ;
-#else
- Word32 register c=a*b;
-#if (WMOPS)
- multiCounter[currCounter].i_mult++;
-#endif
- return saturate(c) ;
-#endif
-}
-/* ------------------------- End of i_mult() ------------------------- */
-
-
-/*
- **********************************************************************
- The following three operators are not part of the original
- G.729/G.723.1 set of basic operators and implement shiftless
- accumulation operation.
- **********************************************************************
-*/
-
-/*___________________________________________________________________________
- |
- | Function Name : L_mult0
- |
- | Purpose :
- |
- | L_mult0 is the 32 bit result of the multiplication of var1 times var2
- | without one left shift.
- |
- | Complexity weight : 1
- |
- | Inputs :
- |
- | var1 16 bit short signed integer (Word16) whose value falls in the
- | range : 0xffff 8000 <= var1 <= 0x0000 7fff.
- |
- | var2 16 bit short signed integer (Word16) whose value falls in the
- | range : 0xffff 8000 <= var1 <= 0x0000 7fff.
- |
- | Return Value :
- |
- | L_var_out
- | 32 bit long signed integer (Word32) whose value falls in the
- | range : 0x8000 0000 <= L_var_out <= 0x7fff ffff.
- |___________________________________________________________________________
-*/
-LIBG7221_DEF(Word32) L_mult0 (Word16 var1,Word16 var2)
-{
- Word32 L_var_out;
-
- L_var_out = (Word32)var1 * (Word32)var2;
-
-#if (WMOPS)
- multiCounter[currCounter].L_mult0++;
-#endif
- return(L_var_out);
-}
-/* ------------------------- End of L_mult0() ------------------------- */
-
-
-/*___________________________________________________________________________
- |
- | Function Name : L_mac0
- |
- | Purpose :
- |
- | Multiply var1 by var2 (without left shift) and add the 32 bit result to
- | L_var3 with saturation, return a 32 bit result:
- | L_mac0(L_var3,var1,var2) = L_add(L_var3,(L_mult0(var1,var2)).
- |
- | Complexity weight : 1
- |
- | Inputs :
- |
- | L_var3 32 bit long signed integer (Word32) whose value falls in the
- | range : 0x8000 0000 <= L_var3 <= 0x7fff ffff.
- |
- | var1 16 bit short signed integer (Word16) whose value falls in the
- | range : 0xffff 8000 <= var1 <= 0x0000 7fff.
- |
- | var2 16 bit short signed integer (Word16) whose value falls in the
- | range : 0xffff 8000 <= var1 <= 0x0000 7fff.
- |
- | Return Value :
- |
- | L_var_out
- | 32 bit long signed integer (Word32) whose value falls in the
- | range : 0x8000 0000 <= L_var_out <= 0x7fff ffff.
- |___________________________________________________________________________
-*/
-LIBG7221_DEF(Word32) L_mac0 (Word32 L_var3, Word16 var1, Word16 var2)
-{
- Word32 L_var_out;
- Word32 L_product;
-
- L_product = L_mult0(var1,var2);
- L_var_out = L_add(L_var3,L_product);
-
-#if (WMOPS)
- multiCounter[currCounter].L_mac0++;
- multiCounter[currCounter].L_mult0--;
- multiCounter[currCounter].L_add--;
-#endif
- return(L_var_out);
-}
-/* ------------------------- End of L_mac0() ------------------------- */
-
-
-/*___________________________________________________________________________
- |
- | Function Name : L_msu0
- |
- | Purpose :
- |
- | Multiply var1 by var2 (without left shift) and subtract the 32 bit
- | result to L_var3 with saturation, return a 32 bit result:
- | L_msu0(L_var3,var1,var2) = L_sub(L_var3,(L_mult0(var1,var2)).
- |
- | Complexity weight : 1
- |
- | Inputs :
- |
- | L_var3 32 bit long signed integer (Word32) whose value falls in the
- | range : 0x8000 0000 <= L_var3 <= 0x7fff ffff.
- |
- | var1 16 bit short signed integer (Word16) whose value falls in the
- | range : 0xffff 8000 <= var1 <= 0x0000 7fff.
- |
- | var2 16 bit short signed integer (Word16) whose value falls in the
- | range : 0xffff 8000 <= var1 <= 0x0000 7fff.
- |
- | Return Value :
- |
- | L_var_out
- | 32 bit long signed integer (Word32) whose value falls in the
- | range : 0x8000 0000 <= L_var_out <= 0x7fff ffff.
- |___________________________________________________________________________
-*/
-LIBG7221_DEF(Word32) L_msu0 (Word32 L_var3, Word16 var1, Word16 var2)
-{
- Word32 L_var_out;
- Word32 L_product;
-
- L_product = L_mult0(var1,var2);
- L_var_out = L_sub(L_var3,L_product);
-
-#if (WMOPS)
- multiCounter[currCounter].L_msu0++;
- multiCounter[currCounter].L_mult0--;
- multiCounter[currCounter].L_sub--;
-#endif
- return(L_var_out);
-}
-/* ------------------------- End of L_msu0() ------------------------- */
-
-
-/*___________________________________________________________________________
- | |
- | Function Name : LU_shl |
- | |
- | Purpose : |
- | |
- | Arithmetically shift the 32 bit input L_var1 left var2 positions. Zero |
- | fill the var2 LSB of the result. If var2 is negative, arithmetically |
- | shift L_var1 right by -var2 with sign extension. Saturate the result in |
- | case of underflows or overflows. |
- | |
- | Complexity weight : 2 |
- | |
- | Inputs : |
- | |
- | L_var1 32 bit long signed integer (Word32) whose value falls in the |
- | range : 0x8000 0000 <= L_var3 <= 0x7fff ffff. |
- | |
- | var2 |
- | 16 bit short signed integer (Word16) whose value falls in the |
- | range : 0xffff 8000 <= var1 <= 0x0000 7fff. |
- | |
- | Outputs : |
- | |
- | none |
- | |
- | Return Value : |
- | |
- | L_var_out |
- | 32 bit long signed integer (Word32) whose value falls in the |
- | range : 0x8000 0000 <= L_var_out <= 0x7fff ffff. |
- |___________________________________________________________________________|
-*/
-LIBG7221_DEF(UWord32) LU_shl (UWord32 L_var1, Word16 var2)
-{
- Word16 neg_var2;
- UWord32 L_var_out = 0;
-
- if (var2 <= 0)
- {
- if (var2 < -32)
- var2 = -32;
- neg_var2 = negate(var2);
- L_var_out = LU_shr (L_var1, neg_var2);
-#if (WMOPS)
- multiCounter[currCounter].negate--;
- multiCounter[currCounter].LU_shr--;
-#endif
- }
- else
- {
- for (; var2 > 0; var2--)
- {
- if (L_var1 > (UWord32) 0X7fffffffL)
- {
- SET_OVERFLOW(1);
- L_var_out = UMAX_32;
- break;
- }
- else
- {
- if (L_var1 < (UWord32) 0x00000001L)
- {
- SET_OVERFLOW(1);
- L_var_out = (UWord32)MIN_32;
- break;
- }
- }
- L_var1 *= 2;
- L_var_out = L_var1;
- }
- }
-#if (WMOPS)
- multiCounter[currCounter].LU_shl++;
-#endif
- return (L_var_out);
-}
-/* ------------------------- End of LU_shl() ------------------------- */
-
-
-/*___________________________________________________________________________
- | |
- | Function Name : LU_shr |
- | |
- | Purpose : |
- | |
- | Arithmetically shift the 32 bit input L_var1 right var2 positions with |
- | sign extension. If var2 is negative, arithmetically shift L_var1 left |
- | by -var2 and zero fill the -var2 LSB of the result. Saturate the result |
- | in case of underflows or overflows. |
- | |
- | Complexity weight : 2 |
- | |
- | Inputs : |
- | |
- | L_var1 32 bit long signed integer (Word32) whose value falls in the |
- | range : 0x8000 0000 <= L_var3 <= 0x7fff ffff. |
- | |
- | var2 |
- | 16 bit short signed integer (Word16) whose value falls in the |
- | range : 0xffff 8000 <= var1 <= 0x0000 7fff. |
- | |
- | Outputs : |
- | |
- | none |
- | |
- | Return Value : |
- | |
- | L_var_out |
- | 32 bit long signed integer (Word32) whose value falls in the |
- | range : 0x8000 0000 <= L_var_out <= 0x7fff ffff. |
- |___________________________________________________________________________|
-*/
-LIBG7221_DEF(UWord32) LU_shr (UWord32 L_var1, Word16 var2)
-{
- Word16 neg_var2;
- UWord32 L_var_out;
-
- if (var2 < 0)
- {
- if (var2 < -32)
- var2 = -32;
- neg_var2 = negate(var2);
- L_var_out = LU_shl (L_var1, neg_var2);
-#if (WMOPS)
- multiCounter[currCounter].negate--;
- multiCounter[currCounter].LU_shl--;
-#endif
- }
- else
- {
- if (var2 >= 32)
- {
- L_var_out = 0L;
- }
- else
- {
- L_var_out = L_var1 >> var2;
- }
- }
-#if (WMOPS)
- multiCounter[currCounter].LU_shr++;
-#endif
- return (L_var_out);
-}
-/* ------------------------- End of LU_shr() ------------------------- */
-
-#endif /* PJMEDIA_LIBG7221_FUNCS_INLINED */
-
-/* ************************** END OF BASOP32.C ************************** */
diff --git a/sflphone-common/libs/pjproject/third_party/g7221/common/basic_op.h b/sflphone-common/libs/pjproject/third_party/g7221/common/basic_op.h
deleted file mode 100644
index 45104d1ce1773e200fb03e4d9156aa5863866cd8..0000000000000000000000000000000000000000
--- a/sflphone-common/libs/pjproject/third_party/g7221/common/basic_op.h
+++ /dev/null
@@ -1,117 +0,0 @@
-#ifndef __BASIC_OP_H__
-#define __BASIC_OP_H__
-
-#include "config.h"
-
-/*___________________________________________________________________________
- | |
- | Constants and Globals |
- |___________________________________________________________________________|
-*/
-
-#define MAX_32 (Word32)0x7fffffffL
-#define MIN_32 (Word32)0x80000000L
-
-#define MAX_16 (Word16)0x7fff
-#define MIN_16 (Word16)(pj_uint16_t)0x8000
-
-#define UMAX_32 (UWord32)0xffffffffL
-#define UMIN_32 (UWord32)0x00000000L
-
-/*___________________________________________________________________________
- | |
- | Prototypes for basic arithmetic operators |
- |___________________________________________________________________________|
-*/
-
-PJ_INLINE(Word16) add (Word16 var1, Word16 var2); /* Short add, 1 */
-PJ_INLINE(Word16) sub (Word16 var1, Word16 var2); /* Short sub, 1 */
-PJ_INLINE(Word16) abs_s (Word16 var1); /* Short abs, 1 */
-LIBG7221_DECL(Word16) shl (Word16 var1, Word16 var2); /* Short shift left, 1 */
-PJ_INLINE(Word16) shl_nocheck(Word16 var1, Word16 var2);
-LIBG7221_DECL(Word16) shr (Word16 var1, Word16 var2); /* Short shift right, 1 */
-PJ_INLINE(Word16) shr_nocheck(Word16 var1, Word16 var2);
-LIBG7221_DECL(Word16) mult (Word16 var1, Word16 var2); /* Short mult, 1 */
-PJ_INLINE(Word32) L_mult (Word16 var1, Word16 var2); /* Long mult, 1 */
-PJ_INLINE(Word16) negate (Word16 var1); /* Short negate, 1 */
-PJ_INLINE(Word16) extract_h (Word32 L_var1); /* Extract high, 1 */
-PJ_INLINE(Word16) extract_l (Word32 L_var1); /* Extract low, 1 */
-PJ_INLINE(Word16) itu_round (Word32 L_var1); /* Round, 1 */
-PJ_INLINE(Word32) L_mac (Word32 L_var3, Word16 var1, Word16 var2); /* Mac, 1 */
-LIBG7221_DECL(Word32) L_msu (Word32 L_var3, Word16 var1, Word16 var2); /* Msu, 1 */
-LIBG7221_DECL(Word32) L_macNs (Word32 L_var3, Word16 var1, Word16 var2); /* Mac without
- sat, 1 */
-LIBG7221_DECL(Word32) L_msuNs (Word32 L_var3, Word16 var1, Word16 var2); /* Msu without
- sat, 1 */
-//PJ_INLINE(Word32) L_add (Word32 L_var1, Word32 L_var2); /* Long add, 2 */
-PJ_INLINE(Word32) L_sub (Word32 L_var1, Word32 L_var2); /* Long sub, 2 */
-LIBG7221_DECL(Word32) L_add_c (Word32 L_var1, Word32 L_var2); /* Long add with c, 2 */
-LIBG7221_DECL(Word32) L_sub_c (Word32 L_var1, Word32 L_var2); /* Long sub with c, 2 */
-LIBG7221_DECL(Word32) L_negate (Word32 L_var1); /* Long negate, 2 */
-LIBG7221_DECL(Word16) mult_r (Word16 var1, Word16 var2); /* Mult with round, 2 */
-PJ_INLINE(Word32) L_shl (Word32 L_var1, Word16 var2); /* Long shift left, 2 */
-PJ_INLINE(Word32) L_shr (Word32 L_var1, Word16 var2); /* Long shift right, 2*/
-LIBG7221_DECL(Word16) shr_r (Word16 var1, Word16 var2); /* Shift right with
- round, 2 */
-LIBG7221_DECL(Word16) mac_r (Word32 L_var3, Word16 var1, Word16 var2); /* Mac with
- rounding,2 */
-LIBG7221_DECL(Word16) msu_r (Word32 L_var3, Word16 var1, Word16 var2); /* Msu with
- rounding,2 */
-LIBG7221_DECL(Word32) L_deposit_h (Word16 var1); /* 16 bit var1 -> MSB, 2 */
-LIBG7221_DECL(Word32) L_deposit_l (Word16 var1); /* 16 bit var1 -> LSB, 2 */
-
-LIBG7221_DECL(Word32) L_shr_r (Word32 L_var1, Word16 var2); /* Long shift right with
- round, 3 */
-LIBG7221_DECL(Word32) L_abs (Word32 L_var1); /* Long abs, 3 */
-LIBG7221_DECL(Word32) L_sat (Word32 L_var1); /* Long saturation, 4 */
-LIBG7221_DECL(Word16) norm_s (Word16 var1); /* Short norm, 15 */
-LIBG7221_DECL(Word16) div_s (Word16 var1, Word16 var2); /* Short division, 18 */
-LIBG7221_DECL(Word16) norm_l (Word32 L_var1); /* Long norm, 30 */
-
-/*
- Additional G.723.1 operators
-*/
-LIBG7221_DECL(Word32) L_mls( Word32, Word16 ) ; /* Weight FFS; currently assigned 1 */
-LIBG7221_DECL(Word16) div_l( Word32, Word16 ) ; /* Weight FFS; currently assigned 1 */
-LIBG7221_DECL(Word16) i_mult(Word16 a, Word16 b); /* Weight FFS; currently assigned 1 */
-
-/*
- New shiftless operators, not used in G.729/G.723.1
-*/
-LIBG7221_DECL(Word32) L_mult0(Word16 v1, Word16 v2); /* 32-bit Multiply w/o shift 1 */
-LIBG7221_DECL(Word32) L_mac0(Word32 L_v3, Word16 v1, Word16 v2); /* 32-bit Mac w/o shift 1 */
-LIBG7221_DECL(Word32) L_msu0(Word32 L_v3, Word16 v1, Word16 v2); /* 32-bit Msu w/o shift 1 */
-
-/*
- Additional G.722.1 operators
-*/
-LIBG7221_DECL(UWord32) LU_shl (UWord32 L_var1, Word16 var2);
-LIBG7221_DECL(UWord32) LU_shr (UWord32 L_var1, Word16 var2);
-
-#define INCLUDE_UNSAFE 0
-
-/* Local */
-PJ_INLINE(Word16) saturate (Word32 L_var1);
-
-#if INCLUDE_UNSAFE
- extern Flag g7221_Overflow;
- extern Flag g7221_Carry;
-# define SET_OVERFLOW(n) g7221_Overflow = n
-# define SET_CARRY(n) g7221_Carry = n
-
-#else
-# define SET_OVERFLOW(n)
-# define SET_CARRY(n)
-# define GET_OVERFLOW() 0
-# define GET_CARRY() 0
-#endif
-
-#include "basic_op_i.h"
-
-#if PJMEDIA_LIBG7221_FUNCS_INLINED
-# include "basic_op.c"
-#endif
-
-#endif /* __BASIC_OP_H__ */
-
-
diff --git a/sflphone-common/libs/pjproject/third_party/g7221/common/basic_op_i.h b/sflphone-common/libs/pjproject/third_party/g7221/common/basic_op_i.h
deleted file mode 100644
index d6906237b100b75aef8dce6b5286979a94f4b645..0000000000000000000000000000000000000000
--- a/sflphone-common/libs/pjproject/third_party/g7221/common/basic_op_i.h
+++ /dev/null
@@ -1,730 +0,0 @@
-/*___________________________________________________________________________
- | |
- | Function Name : extract_h |
- | |
- | Purpose : |
- | |
- | Return the 16 MSB of L_var1. |
- | |
- | Complexity weight : 1 |
- | |
- | Inputs : |
- | |
- | L_var1 |
- | 32 bit long signed integer (Word32 ) whose value falls in the |
- | range : 0x8000 0000 <= L_var1 <= 0x7fff ffff. |
- | |
- | Outputs : |
- | |
- | none |
- | |
- | Return Value : |
- | |
- | var_out |
- | 16 bit short signed integer (Word16) whose value falls in the |
- | range : 0xffff 8000 <= var_out <= 0x0000 7fff. |
- |___________________________________________________________________________|
-*/
-PJ_INLINE(Word16) extract_h (Word32 L_var1)
-{
- return (Word16) (L_var1 >> 16);
-}
-/* ------------------------- End of extract_h() ------------------------- */
-
-
-/*___________________________________________________________________________
- | |
- | Function Name : extract_l |
- | |
- | Purpose : |
- | |
- | Return the 16 LSB of L_var1. |
- | |
- | Complexity weight : 1 |
- | |
- | Inputs : |
- | |
- | L_var1 |
- | 32 bit long signed integer (Word32 ) whose value falls in the |
- | range : 0x8000 0000 <= L_var1 <= 0x7fff ffff. |
- | |
- | Outputs : |
- | |
- | none |
- | |
- | Return Value : |
- | |
- | var_out |
- | 16 bit short signed integer (Word16) whose value falls in the |
- | range : 0xffff 8000 <= var_out <= 0x0000 7fff. |
- |___________________________________________________________________________|
-*/
-PJ_INLINE(Word16) extract_l (Word32 L_var1)
-{
- return (Word16) L_var1;
-}
-
-/* ------------------------- End of extract_l() ------------------------- */
-
-
-/*___________________________________________________________________________
- | |
- | Function Name : saturate |
- | |
- | Purpose : |
- | |
- | Limit the 32 bit input to the range of a 16 bit word. |
- | |
- | Inputs : |
- | |
- | L_var1 |
- | 32 bit long signed integer (Word32) whose value falls in the |
- | range : 0x8000 0000 <= L_var1 <= 0x7fff ffff. |
- | |
- | Outputs : |
- | |
- | none |
- | |
- | Return Value : |
- | |
- | var_out |
- | 16 bit short signed integer (Word16) whose value falls in the |
- | range : 0xffff 8000 <= var_out <= 0x0000 7fff. |
- |___________________________________________________________________________|
-*/
-PJ_INLINE(Word16) saturate (Word32 L_var1)
-{
- Word16 val16 = (Word16) L_var1;
-
- if (val16 == L_var1)
- return val16;
-
- if (L_var1 > MAX_16)
- return MAX_16;
- return MIN_16;
-}
-/* ------------------------- End of saturate() ------------------------- */
-
-
-#if PJ_HAS_INT64
-PJ_INLINE(Word32) L_saturate (pj_int64_t LL_var1)
-{
- pj_int32_t L_var1 = (pj_int32_t)LL_var1;
- if (LL_var1 == L_var1)
- return L_var1;
- else if (LL_var1 > MAX_32)
- return MAX_32;
- else
- return MIN_32;
-}
-#endif
-
-
-/*___________________________________________________________________________
- | |
- | Function Name : add |
- | |
- | Purpose : |
- | |
- | Performs the addition (var1+var2) with overflow control and saturation;|
- | the 16 bit result is set at +32767 when overflow occurs or at -32768 |
- | when underflow occurs. |
- | |
- | Complexity weight : 1 |
- | |
- | Inputs : |
- | |
- | var1 |
- | 16 bit short signed integer (Word16) whose value falls in the |
- | range : 0xffff 8000 <= var1 <= 0x0000 7fff. |
- | |
- | var2 |
- | 16 bit short signed integer (Word16) whose value falls in the |
- | range : 0xffff 8000 <= var1 <= 0x0000 7fff. |
- | |
- | Outputs : |
- | |
- | none |
- | |
- | Return Value : |
- | |
- | var_out |
- | 16 bit short signed integer (Word16) whose value falls in the |
- | range : 0xffff 8000 <= var_out <= 0x0000 7fff. |
- |___________________________________________________________________________|
-*/
-PJ_INLINE(Word16) add (Word16 var1, Word16 var2)
-{
- return saturate (var1 + var2);
-}
-/* ------------------------- End of add() ------------------------- */
-
-
-/*___________________________________________________________________________
- | |
- | Function Name : sub |
- | |
- | Purpose : |
- | |
- | Performs the subtraction (var1+var2) with overflow control and satu- |
- | ration; the 16 bit result is set at +32767 when overflow occurs or at |
- | -32768 when underflow occurs. |
- | |
- | Complexity weight : 1 |
- | |
- | Inputs : |
- | |
- | var1 |
- | 16 bit short signed integer (Word16) whose value falls in the |
- | range : 0xffff 8000 <= var1 <= 0x0000 7fff. |
- | |
- | var2 |
- | 16 bit short signed integer (Word16) whose value falls in the |
- | range : 0xffff 8000 <= var1 <= 0x0000 7fff. |
- | |
- | Outputs : |
- | |
- | none |
- | |
- | Return Value : |
- | |
- | var_out |
- | 16 bit short signed integer (Word16) whose value falls in the |
- | range : 0xffff 8000 <= var_out <= 0x0000 7fff. |
- |___________________________________________________________________________|
-*/
-PJ_INLINE(Word16) sub (Word16 var1, Word16 var2)
-{
- return saturate ((Word32) var1 - var2);
-}
-/* ------------------------- End of sub() ------------------------- */
-
-
-/*___________________________________________________________________________
- | |
- | Function Name : negate |
- | |
- | Purpose : |
- | |
- | Negate var1 with saturation, saturate in the case where input is -32768:|
- | negate(var1) = sub(0,var1). |
- | |
- | Complexity weight : 1 |
- | |
- | Inputs : |
- | |
- | var1 |
- | 16 bit short signed integer (Word16) whose value falls in the |
- | range : 0xffff 8000 <= var1 <= 0x0000 7fff. |
- | |
- | Outputs : |
- | |
- | none |
- | |
- | Return Value : |
- | |
- | var_out |
- | 16 bit short signed integer (Word16) whose value falls in the |
- | range : 0xffff 8000 <= var_out <= 0x0000 7fff. |
- |___________________________________________________________________________|
-*/
-PJ_INLINE(Word16) negate (Word16 var1)
-{
- return (Word16)((var1 == MIN_16) ? MAX_16 : -var1);
-}
-/* ------------------------- End of negate() ------------------------- */
-
-
-
-
-/*___________________________________________________________________________
- | |
- | Function Name : L_add |
- | |
- | Purpose : |
- | |
- | 32 bits addition of the two 32 bits variables (L_var1+L_var2) with |
- | overflow control and saturation; the result is set at +2147483647 when |
- | overflow occurs or at -2147483648 when underflow occurs. |
- | |
- | Complexity weight : 2 |
- | |
- | Inputs : |
- | |
- | L_var1 32 bit long signed integer (Word32) whose value falls in the |
- | range : 0x8000 0000 <= L_var3 <= 0x7fff ffff. |
- | |
- | L_var2 32 bit long signed integer (Word32) whose value falls in the |
- | range : 0x8000 0000 <= L_var3 <= 0x7fff ffff. |
- | |
- | Outputs : |
- | |
- | none |
- | |
- | Return Value : |
- | |
- | L_var_out |
- | 32 bit long signed integer (Word32) whose value falls in the |
- | range : 0x8000 0000 <= L_var_out <= 0x7fff ffff. |
- |___________________________________________________________________________|
-*/
-PJ_INLINE(Word32) L_add (Word32 L_var1, Word32 L_var2)
-{
-#if PJ_HAS_INT64
- return L_saturate(((pj_int64_t)L_var1) + L_var2);
-#else
- Word32 L_var_out;
-
- L_var_out = L_var1 + L_var2;
-
- if (((L_var1 ^ L_var2) & MIN_32) == 0)
- {
- if ((L_var_out ^ L_var1) & MIN_32)
- {
- SET_OVERFLOW(1);
- L_var_out = (L_var1 < 0) ? MIN_32 : MAX_32;
- }
- }
- return (L_var_out);
-#endif
-}
-
-/* ------------------------- End of L_add() ------------------------- */
-
-
-
-
-/*___________________________________________________________________________
- | |
- | Function Name : L_sub |
- | |
- | Purpose : |
- | |
- | 32 bits subtraction of the two 32 bits variables (L_var1-L_var2) with |
- | overflow control and saturation; the result is set at +2147483647 when |
- | overflow occurs or at -2147483648 when underflow occurs. |
- | |
- | Complexity weight : 2 |
- | |
- | Inputs : |
- | |
- | L_var1 32 bit long signed integer (Word32) whose value falls in the |
- | range : 0x8000 0000 <= L_var3 <= 0x7fff ffff. |
- | |
- | L_var2 32 bit long signed integer (Word32) whose value falls in the |
- | range : 0x8000 0000 <= L_var3 <= 0x7fff ffff. |
- | |
- | Outputs : |
- | |
- | none |
- | |
- | Return Value : |
- | |
- | L_var_out |
- | 32 bit long signed integer (Word32) whose value falls in the |
- | range : 0x8000 0000 <= L_var_out <= 0x7fff ffff. |
- |___________________________________________________________________________|
-*/
-PJ_INLINE(Word32) L_sub (Word32 L_var1, Word32 L_var2)
-{
-#if PJ_HAS_INT64
- return L_saturate((pj_int64_t)L_var1 - L_var2);
-#else
- Word32 L_var_out;
-
- L_var_out = L_var1 - L_var2;
-
- if (((L_var1 ^ L_var2) & MIN_32) != 0)
- {
- if ((L_var_out ^ L_var1) & MIN_32)
- {
- L_var_out = (L_var1 < 0L) ? MIN_32 : MAX_32;
- SET_OVERFLOW(1);
- }
- }
- return (L_var_out);
-#endif
-}
-/* ------------------------- End of L_sub() ------------------------- */
-
-/*___________________________________________________________________________
- | |
- | Function Name : L_mult |
- | |
- | Purpose : |
- | |
- | L_mult is the 32 bit result of the multiplication of var1 times var2 |
- | with one shift left i.e.: |
- | L_mult(var1,var2) = L_shl((var1 times var2),1) and |
- | L_mult(-32768,-32768) = 2147483647. |
- | |
- | Complexity weight : 1 |
- | |
- | Inputs : |
- | |
- | var1 |
- | 16 bit short signed integer (Word16) whose value falls in the |
- | range : 0xffff 8000 <= var1 <= 0x0000 7fff. |
- | |
- | var2 |
- | 16 bit short signed integer (Word16) whose value falls in the |
- | range : 0xffff 8000 <= var1 <= 0x0000 7fff. |
- | |
- | Outputs : |
- | |
- | none |
- | |
- | Return Value : |
- | |
- | L_var_out |
- | 32 bit long signed integer (Word32) whose value falls in the |
- | range : 0x8000 0000 <= L_var_out <= 0x7fff ffff. |
- |___________________________________________________________________________|
-*/
-PJ_INLINE(Word32) L_mult (Word16 var1, Word16 var2)
-{
- Word32 L_var_out;
-
- L_var_out = (Word32) var1 *(Word32) var2;
-
- if (L_var_out != (Word32) 0x40000000L)
- {
- return L_var_out << 1;
- }
- else
- {
- SET_OVERFLOW(1);
- return MAX_32;
- }
-}
-/* ------------------------- End of L_mult() ------------------------- */
-
-
-/*___________________________________________________________________________
- | |
- | Function Name : L_mac |
- | |
- | Purpose : |
- | |
- | Multiply var1 by var2 and shift the result left by 1. Add the 32 bit |
- | result to L_var3 with saturation, return a 32 bit result: |
- | L_mac(L_var3,var1,var2) = L_add(L_var3,L_mult(var1,var2)). |
- | |
- | Complexity weight : 1 |
- | |
- | Inputs : |
- | |
- | L_var3 32 bit long signed integer (Word32) whose value falls in the |
- | range : 0x8000 0000 <= L_var3 <= 0x7fff ffff. |
- | |
- | var1 |
- | 16 bit short signed integer (Word16) whose value falls in the |
- | range : 0xffff 8000 <= var1 <= 0x0000 7fff. |
- | |
- | var2 |
- | 16 bit short signed integer (Word16) whose value falls in the |
- | range : 0xffff 8000 <= var1 <= 0x0000 7fff. |
- | |
- | Outputs : |
- | |
- | none |
- | |
- | Return Value : |
- | |
- | L_var_out |
- | 32 bit long signed integer (Word32) whose value falls in the |
- | range : 0x8000 0000 <= L_var_out <= 0x7fff ffff. |
- |___________________________________________________________________________|
-*/
-PJ_INLINE(Word32) L_mac (Word32 L_var3, Word16 var1, Word16 var2)
-{
- return L_add (L_var3, L_mult (var1, var2));
-}
-/* ------------------------- End of L_mac() ------------------------- */
-
-
-/*___________________________________________________________________________
- | |
- | Function Name : round |
- | |
- | Purpose : |
- | |
- | Round the lower 16 bits of the 32 bit input number into the MS 16 bits |
- | with saturation. Shift the resulting bits right by 16 and return the 16 |
- | bit number: |
- | round(L_var1) = extract_h(L_add(L_var1,32768)) |
- | |
- | Complexity weight : 1 |
- | |
- | Inputs : |
- | |
- | L_var1 |
- | 32 bit long signed integer (Word32 ) whose value falls in the |
- | range : 0x8000 0000 <= L_var1 <= 0x7fff ffff. |
- | |
- | Outputs : |
- | |
- | none |
- | |
- | Return Value : |
- | |
- | var_out |
- | 16 bit short signed integer (Word16) whose value falls in the |
- | range : 0xffff 8000 <= var_out <= 0x0000 7fff. |
- |___________________________________________________________________________|
-*/
-PJ_INLINE(Word16) itu_round (Word32 L_var1)
-{
- return extract_h (L_add (L_var1, (Word32) 0x00008000L));
-}
-/* ------------------------- End of round() ------------------------- */
-
-
-/*___________________________________________________________________________
- | |
- | Function Name : L_shr |
- | |
- | Purpose : |
- | |
- | Arithmetically shift the 32 bit input L_var1 right var2 positions with |
- | sign extension. If var2 is negative, arithmetically shift L_var1 left |
- | by -var2 and zero fill the -var2 LSB of the result. Saturate the result |
- | in case of underflows or overflows. |
- | |
- | Complexity weight : 2 |
- | |
- | Inputs : |
- | |
- | L_var1 32 bit long signed integer (Word32) whose value falls in the |
- | range : 0x8000 0000 <= L_var3 <= 0x7fff ffff. |
- | |
- | var2 |
- | 16 bit short signed integer (Word16) whose value falls in the |
- | range : 0xffff 8000 <= var1 <= 0x0000 7fff. |
- | |
- | Outputs : |
- | |
- | none |
- | |
- | Return Value : |
- | |
- | L_var_out |
- | 32 bit long signed integer (Word32) whose value falls in the |
- | range : 0x8000 0000 <= L_var_out <= 0x7fff ffff. |
- |___________________________________________________________________________|
-*/
-PJ_INLINE(Word32) L_shr_nocheck(Word32 L_var1, Word16 var2)
-{
-#if 1
- return L_var1 >> var2;
-#else
- if (var2 >= 31)
- {
- return (L_var1 < 0L) ? -1 : 0;
- }
- else
- {
- if (L_var1 < 0)
- {
- return ~((~L_var1) >> var2);
- }
- else
- {
- return L_var1 >> var2;
- }
- }
-#endif
-}
-
-PJ_INLINE(Word32) L_shl_nocheck (Word32 L_var1, Word16 var2)
-{
-#if PJ_HAS_INT64
- return L_saturate( ((pj_int64_t)L_var1) << var2 );
-#else
- for (; var2 > 0; var2--)
- {
- if (L_var1 > (Word32) 0X3fffffffL)
- {
- SET_OVERFLOW(1);
- return MAX_32;
- }
- else
- {
- if (L_var1 < (Word32) 0xc0000000L)
- {
- SET_OVERFLOW(1);
- return MIN_32;
- }
- }
- L_var1 <<= 1;
- }
- return (L_var1);
-#endif
-}
-
-PJ_INLINE(Word32) L_shr (Word32 L_var1, Word16 var2)
-{
- if (var2 < 0)
- {
- if (var2 < -32)
- var2 = -32;
- return L_shl_nocheck (L_var1, (Word16) -var2);
- }
- else
- {
- return L_shr_nocheck(L_var1, var2);
- }
-}
-/* ------------------------- End of L_shr() ------------------------- */
-
-/*___________________________________________________________________________
- | |
- | Function Name : L_shl |
- | |
- | Purpose : |
- | |
- | Arithmetically shift the 32 bit input L_var1 left var2 positions. Zero |
- | fill the var2 LSB of the result. If var2 is negative, arithmetically |
- | shift L_var1 right by -var2 with sign extension. Saturate the result in |
- | case of underflows or overflows. |
- | |
- | Complexity weight : 2 |
- | |
- | Inputs : |
- | |
- | L_var1 32 bit long signed integer (Word32) whose value falls in the |
- | range : 0x8000 0000 <= L_var3 <= 0x7fff ffff. |
- | |
- | var2 |
- | 16 bit short signed integer (Word16) whose value falls in the |
- | range : 0xffff 8000 <= var1 <= 0x0000 7fff. |
- | |
- | Outputs : |
- | |
- | none |
- | |
- | Return Value : |
- | |
- | L_var_out |
- | 32 bit long signed integer (Word32) whose value falls in the |
- | range : 0x8000 0000 <= L_var_out <= 0x7fff ffff. |
- |___________________________________________________________________________|
-*/
-PJ_INLINE(Word32) L_shl (Word32 L_var1, Word16 var2)
-{
- if (var2 <= 0)
- {
- if (var2 < -32)
- var2 = -32;
- return L_shr_nocheck(L_var1, (Word16) -var2);
- }
- else
- {
- return L_shl_nocheck(L_var1, var2);
- }
-}
-/* ------------------------- End of L_shl() ------------------------- */
-
-
-/*___________________________________________________________________________
- | |
- | Function Name : abs_s |
- | |
- | Purpose : |
- | |
- | Absolute value of var1; abs_s(-32768) = 32767. |
- | |
- | Complexity weight : 1 |
- | |
- | Inputs : |
- | |
- | var1 |
- | 16 bit short signed integer (Word16) whose value falls in the |
- | range : 0xffff 8000 <= var1 <= 0x0000 7fff. |
- | |
- | Outputs : |
- | |
- | none |
- | |
- | Return Value : |
- | |
- | var_out |
- | 16 bit short signed integer (Word16) whose value falls in the |
- | range : 0x0000 0000 <= var_out <= 0x0000 7fff. |
- |___________________________________________________________________________|
-*/
-PJ_INLINE(Word16) abs_s (Word16 var1)
-{
-#if 1
- if (var1 >= 0)
- return var1;
- else if (var1 == MIN_16)
- return MAX_16;
- else
- return (Word16)-var1;
-#else
- if (var1 == MIN_16)
- {
- return MAX_16;
- }
- else
- {
- if (var1 < 0)
- {
- return (Word16)-var1;
- }
- else
- {
- return var1;
- }
- }
-#endif
-}
-/* ------------------------- End of abs_s() ------------------------- */
-
-
-PJ_INLINE(Word16) shl_nocheck(Word16 var1, Word16 var2)
-{
-#if 1
- /* blp: this should be more optimized */
- return saturate (((Word32)var1) << var2);
-#else
- /* Original algorithm */
- Word32 result = (Word32) var1 *((Word32) 1 << var2);
-
- if ((var2 > 15 && var1 != 0) || (result != (Word32) ((Word16) result)))
- {
- SET_OVERFLOW(1);
- return (Word16) ((var1 > 0) ? MAX_16 : MIN_16);
- }
- else
- {
- return extract_l (result);
- }
-#endif
-}
-
-PJ_INLINE(Word16) shr_nocheck(Word16 var1, Word16 var2)
-{
-#if 1
- /* blp: this should yield the same value */
- return (Word16) (var1 >> var2);
-#else
- /* Original algorithm */
- if (var2 >= 15)
- {
- return (Word16)((var1 < 0) ? -1 : 0);
- }
- else
- {
- if (var1 < 0)
- {
- return (Word16) (~((~var1) >> var2));
- }
- else
- {
- return (Word16)(var1 >> var2);
- }
- }
-#endif
-}
diff --git a/sflphone-common/libs/pjproject/third_party/g7221/common/common.c b/sflphone-common/libs/pjproject/third_party/g7221/common/common.c
deleted file mode 100644
index d5eed810505d743598c6a1e066dc1bf80a215f3f..0000000000000000000000000000000000000000
--- a/sflphone-common/libs/pjproject/third_party/g7221/common/common.c
+++ /dev/null
@@ -1,461 +0,0 @@
-/****************************************************************************************
-**
-** ITU-T G.722.1 (2005-05) - Fixed point implementation for main body and Annex C
-** > Software Release 2.1 (2008-06)
-** (Simple repackaging; no change from 2005-05 Release 2.0 code)
-**
-** � 2004 Polycom, Inc.
-**
-** All rights reserved.
-**
-****************************************************************************************/
-
-/****************************************************************************************
- Filename: common.c
-
- Purpose: Contains the functions used for both G.722.1 Annex C encoder and decoder
-
- Design Notes:
-
-****************************************************************************************/
-/****************************************************************************************
- Include files
-****************************************************************************************/
-#include "defs.h"
-#include "huff_def.h"
-#include "huff_tab.h"
-#include "tables.h"
-#include "count.h"
-
-/****************************************************************************************
- Function: categorize
-
- Syntax: void categorize(Word16 number_of_available_bits,
- Word16 number_of_regions,
- Word16 num_categorization_control_possibilities,
- Word16 rms_index,
- Word16 power_categories,
- Word16 category_balances)
-
- inputs: number_of_regions
- num_categorization_control_possibilities
- number_of_available_bits
- rms_index[MAX_NUMBER_OF_REGIONS]
-
- outputs: power_categories[MAX_NUMBER_OF_REGIONS]
- category_balances[MAX_NUM_CATEGORIZATION_CONTROL_POSSIBILITIES-1]
-
- Description: Computes a series of categorizations
-
- WMOPS: 7kHz | 24kbit | 32kbit
- -------|--------------|----------------
- AVG | 0.14 | 0.14
- -------|--------------|----------------
- MAX | 0.15 | 0.15
- -------|--------------|----------------
-
- 14kHz | 24kbit | 32kbit | 48kbit
- -------|--------------|----------------|----------------
- AVG | 0.42 | 0.45 | 0.48
- -------|--------------|----------------|----------------
- MAX | 0.47 | 0.52 | 0.52
- -------|--------------|----------------|----------------
-
-****************************************************************************************/
-void categorize(Word16 number_of_available_bits,
- Word16 number_of_regions,
- Word16 num_categorization_control_possibilities,
- Word16 *rms_index,
- Word16 *power_categories,
- Word16 *category_balances)
-{
-
- Word16 offset;
- Word16 temp;
- Word16 frame_size;
-
- /* At higher bit rates, there is an increase for most categories in average bit
- consumption per region. We compensate for this by pretending we have fewer
- available bits. */
- test();
- if (number_of_regions == NUMBER_OF_REGIONS)
- {
- frame_size = DCT_LENGTH;
- }
- else
- {
- frame_size = MAX_DCT_LENGTH;
- }
-
- temp = sub(number_of_available_bits,frame_size);
-
- test();
- if (temp > 0)
- {
- number_of_available_bits = sub(number_of_available_bits,frame_size);
- number_of_available_bits = extract_l(L_mult0(number_of_available_bits,5));
- number_of_available_bits = shr_nocheck(number_of_available_bits,3);
- number_of_available_bits = add(number_of_available_bits,frame_size);
- }
-
- /* calculate the offset using the original category assignments */
- offset = calc_offset(rms_index,number_of_regions,number_of_available_bits);
-
-
-
- /* compute the power categories based on the uniform offset */
- compute_raw_pow_categories(power_categories,rms_index,number_of_regions,offset);
-
-
- /* adjust the category assignments */
- /* compute the new power categories and category balances */
- comp_powercat_and_catbalance(power_categories,category_balances,rms_index,number_of_available_bits,number_of_regions,num_categorization_control_possibilities,offset);
-
-}
-
-/***************************************************************************
- Function: comp_powercat_and_catbalance
-
- Syntax: void comp_powercat_and_catbalance(Word16 *power_categories,
- Word16 *category_balances,
- Word16 *rms_index,
- Word16 number_of_available_bits,
- Word16 number_of_regions,
- Word16 num_categorization_control_possibilities,
- Word16 offset)
-
-
- inputs: *rms_index
- number_of_available_bits
- number_of_regions
- num_categorization_control_possibilities
- offset
-
- outputs: *power_categories
- *category_balances
-
-
- Description: Computes the power_categories and the category balances
-
- WMOPS: 7kHz | 24kbit | 32kbit
- -------|--------------|----------------
- AVG | 0.10 | 0.10
- -------|--------------|----------------
- MAX | 0.11 | 0.11
- -------|--------------|----------------
-
- 14kHz | 24kbit | 32kbit | 48kbit
- -------|--------------|----------------|----------------
- AVG | 0.32 | 0.35 | 0.38
- -------|--------------|----------------|----------------
- MAX | 0.38 | 0.42 | 0.43
- -------|--------------|----------------|----------------
-
-***************************************************************************/
-void comp_powercat_and_catbalance(Word16 *power_categories,
- Word16 *category_balances,
- Word16 *rms_index,
- Word16 number_of_available_bits,
- Word16 number_of_regions,
- Word16 num_categorization_control_possibilities,
- Word16 offset)
-{
-
- Word16 expected_number_of_code_bits;
- Word16 region;
- Word16 max_region;
- Word16 j;
- Word16 max_rate_categories[MAX_NUMBER_OF_REGIONS];
- Word16 min_rate_categories[MAX_NUMBER_OF_REGIONS];
- Word16 temp_category_balances[2*MAX_NUM_CATEGORIZATION_CONTROL_POSSIBILITIES];
- Word16 raw_max, raw_min;
- Word16 raw_max_index=0, raw_min_index=0;
- Word16 max_rate_pointer, min_rate_pointer;
- Word16 max, min;
- Word16 itemp0;
- Word16 itemp1;
- Word16 min_plus_max;
- Word16 two_x_number_of_available_bits;
-
- Word16 temp;
-
- expected_number_of_code_bits = 0;
- move16();
-
- for (region=0; region<number_of_regions; region++)
- expected_number_of_code_bits = add(expected_number_of_code_bits,expected_bits_table[power_categories[region]]);
-
-
- for (region=0; region<number_of_regions; region++)
- {
- max_rate_categories[region] = power_categories[region];
- move16();
-
- min_rate_categories[region] = power_categories[region];
- move16();
- }
-
- max = expected_number_of_code_bits;
- move16();
- min = expected_number_of_code_bits;
- move16();
- max_rate_pointer = num_categorization_control_possibilities;
- move16();
- min_rate_pointer = num_categorization_control_possibilities;
- move16();
-
- for (j=0; j<num_categorization_control_possibilities-1; j++)
- {
- min_plus_max = add(max,min);
- two_x_number_of_available_bits = shl_nocheck(number_of_available_bits,1);
-
- temp = sub(min_plus_max,two_x_number_of_available_bits);
- test();
- if (temp <= 0)
- {
- raw_min = 99;
- move16();
- /* Search from lowest freq regions to highest for best */
- /* region to reassign to a higher bit rate category. */
- for (region=0; region<number_of_regions; region++)
- {
- test();
- if (max_rate_categories[region] > 0)
- {
- itemp0 = shl_nocheck(max_rate_categories[region],1);
- itemp1 = sub(offset,rms_index[region]);
- itemp0 = sub(itemp1,itemp0);
-
- temp = sub(itemp0,raw_min);
- test();
- if (temp < 0)
- {
- raw_min = itemp0;
- raw_min_index = region;
- }
- }
- }
- max_rate_pointer = sub(max_rate_pointer,1);
- temp_category_balances[max_rate_pointer] = raw_min_index;
- move16();
-
- max = sub(max,expected_bits_table[max_rate_categories[raw_min_index]]);
- max_rate_categories[raw_min_index] = sub(max_rate_categories[raw_min_index],1);
- move16();
-
- max = add(max,expected_bits_table[max_rate_categories[raw_min_index]]);
- }
- else
- {
- raw_max = -99;
- move16();
- /* Search from highest freq regions to lowest for best region to reassign to
- a lower bit rate category. */
- max_region = sub(number_of_regions,1);
- for (region= max_region; region >= 0; region--)
- {
- temp = sub(min_rate_categories[region],(NUM_CATEGORIES-1));
- test();
- if (temp < 0)
- {
- itemp0 = shl_nocheck(min_rate_categories[region],1);
- itemp1 = sub(offset,rms_index[region]);
- itemp0 = sub(itemp1,itemp0);
-
- temp = sub(itemp0,raw_max);
- test();
- if (temp > 0)
- {
- raw_max = itemp0;
- move16();
- raw_max_index = region;
- move16();
- }
- }
- }
- temp_category_balances[min_rate_pointer] = raw_max_index;
- move16();
-
- min_rate_pointer = add(min_rate_pointer,1);
- min = sub(min,expected_bits_table[min_rate_categories[raw_max_index]]);
-
- min_rate_categories[raw_max_index] = add(min_rate_categories[raw_max_index],1);
- move16();
-
- min = add(min,expected_bits_table[min_rate_categories[raw_max_index]]);
- }
- }
-
- for (region=0; region<number_of_regions; region++)
- {
- power_categories[region] = max_rate_categories[region];
- move16();
- }
-
- for (j=0; j<num_categorization_control_possibilities-1; j++)
- {
- category_balances[j] = temp_category_balances[max_rate_pointer++];
- move16();
- }
-
-}
-/***************************************************************************
- Function: calc_offset
-
- Syntax: offset=calc_offset(Word16 *rms_index,Word16 number_of_regions,Word16 available_bits)
-
- input: Word16 *rms_index
- Word16 number_of_regions
- Word16 available_bits
-
- output: Word16 offset
-
- Description: Calculates the the category offset. This is the shift required
- To get the most out of the number of available bits. A binary
- type search is used to find the offset.
-
- WMOPS: 7kHz | 24kbit | 32kbit
- -------|--------------|----------------
- AVG | 0.04 | 0.04
- -------|--------------|----------------
- MAX | 0.04 | 0.04
- -------|--------------|----------------
-
- 14kHz | 24kbit | 32kbit | 48kbit
- -------|--------------|----------------|----------------
- AVG | 0.08 | 0.08 | 0.08
- -------|--------------|----------------|----------------
- MAX | 0.09 | 0.09 | 0.09
- -------|--------------|----------------|----------------
-
-***************************************************************************/
-Word16 calc_offset(Word16 *rms_index,Word16 number_of_regions,Word16 available_bits)
-{
-
- Word16 answer;
- Word16 delta;
- Word16 test_offset;
- Word16 region,j;
- Word16 power_cats[MAX_NUMBER_OF_REGIONS];
- Word16 bits;
- Word16 offset;
- Word16 temp;
-
- /* initialize vars */
- answer = -32;
- move16();
- delta = 32;
- move16();
-
- do
- {
- test_offset = add(answer,delta);
-
- /* obtain a category for each region */
- /* using the test offset */
- for (region=0; region<number_of_regions; region++)
- {
- j = sub(test_offset,rms_index[region]);
- j = shr_nocheck(j,1);
-
- /* Ensure j is between 0 and NUM_CAT-1 */
- test();
- if (j < 0)
- {
- j = 0;
- move16();
- }
- temp = sub(j,NUM_CATEGORIES-1);
- test();
- if (temp > 0)
- {
- j = sub(NUM_CATEGORIES,1);
- move16();
- }
- power_cats[region] = j;
- move16();
- }
- bits = 0;
- move16();
-
- /* compute the number of bits that will be used given the cat assignments */
- for (region=0; region<number_of_regions; region++)
- bits = add(bits,expected_bits_table[power_cats[region]]);
-
- /* if (bits > available_bits - 32) then divide the offset region for the bin search */
- offset = sub(available_bits,32);
- temp = sub(bits,offset);
- test();
- if (temp >= 0)
- {
- answer = test_offset;
- move16();
- }
- delta = shr_nocheck(delta,1);
- test(); /* for the while loop */
- } while (delta > 0);
-
- return(answer);
-}
-/***************************************************************************
- Function: compute_raw_pow_categories
-
- Syntax: void compute_raw_pow_categories(Word16 *power_categories,
- Word16 *rms_index,
- Word16 number_of_regions,
- Word16 offset)
- inputs: *rms_index
- number_of_regions
- offset
-
- outputs: *power_categories
-
-
-
- Description: This function computes the power categories given the offset
- This is kind of redundant since they were already computed
- in calc_offset to determine the offset.
-
- WMOPS: | 24kbit | 32kbit
- -------|--------------|----------------
- AVG | 0.01 | 0.01
- -------|--------------|----------------
- MAX | 0.01 | 0.01
- -------|--------------|----------------
-
- 14kHz | 24kbit | 32kbit | 48kbit
- -------|--------------|----------------|----------------
- AVG | 0.01 | 0.01 | 0.01
- -------|--------------|----------------|----------------
- MAX | 0.01 | 0.01 | 0.01
- -------|--------------|----------------|----------------
-
-***************************************************************************/
-void compute_raw_pow_categories(Word16 *power_categories,Word16 *rms_index,Word16 number_of_regions,Word16 offset)
-{
- Word16 region;
- Word16 j;
- Word16 temp;
-
- for (region=0; region<number_of_regions; region++)
- {
- j = sub(offset,rms_index[region]);
- j = shr_nocheck(j,1);
-
- /* make sure j is between 0 and NUM_CAT-1 */
- test();
- if (j < 0)
- {
- j = 0;
- move16();
- }
- temp = sub(j,(NUM_CATEGORIES-1));
- test();
- if (temp > 0)
- j = sub(NUM_CATEGORIES,1);
-
- power_categories[region] = j;
- move16();
- }
-}
-
diff --git a/sflphone-common/libs/pjproject/third_party/g7221/common/config.h b/sflphone-common/libs/pjproject/third_party/g7221/common/config.h
deleted file mode 100644
index 4faec787d79753bddee3567150bd1663ec6df8a5..0000000000000000000000000000000000000000
--- a/sflphone-common/libs/pjproject/third_party/g7221/common/config.h
+++ /dev/null
@@ -1,27 +0,0 @@
-#ifndef __LIBG7221_CONFIG_H__
-#define __LIBG7221_CONFIG_H__
-
-#include <pj/config.h>
-
-/**
- * Expand all basic operation functions as inline. Even if this is set to
- * zero, some critical functions would still be expanded as inline. Note
- * also that enabling this may generate some warning messages about functions
- * not being referenced (with gcc).
- *
- * Default: 0 (no)
- */
-#ifndef PJMEDIA_LIBG7221_FUNCS_INLINED
-# define PJMEDIA_LIBG7221_FUNCS_INLINED 0
-#endif
-
-/* Declare/define a function that may be expanded as inline. */
-#if PJMEDIA_LIBG7221_FUNCS_INLINED
-# define LIBG7221_DECL(type) PJ_INLINE(type)
-# define LIBG7221_DEF(type) PJ_INLINE(type)
-#else
-# define LIBG7221_DECL(type) PJ_DECL(type)
-# define LIBG7221_DEF(type) PJ_DEF(type)
-#endif
-
-#endif /* __LIBG7221_CONFIG_H__ */
diff --git a/sflphone-common/libs/pjproject/third_party/g7221/common/count.h b/sflphone-common/libs/pjproject/third_party/g7221/common/count.h
deleted file mode 100644
index 0ead7275a4586ec5e1defafb64ea5f4618be9a29..0000000000000000000000000000000000000000
--- a/sflphone-common/libs/pjproject/third_party/g7221/common/count.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/* $Id: count.h 2623 2009-04-20 18:38:15Z bennylp $ */
-/*
- * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com)
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-#ifndef COUNT_H
-#define COUNT_H
-
-#define move16()
-#define move32()
-#define logic16()
-#define logic32()
-#define test()
-
-#endif
diff --git a/sflphone-common/libs/pjproject/third_party/g7221/common/defs.h b/sflphone-common/libs/pjproject/third_party/g7221/common/defs.h
deleted file mode 100644
index d4c7aa2ec4b627f4257b1aca408b2ddcaf404da0..0000000000000000000000000000000000000000
--- a/sflphone-common/libs/pjproject/third_party/g7221/common/defs.h
+++ /dev/null
@@ -1,205 +0,0 @@
-/***********************************************************************
-**
-** ITU-T G.722.1 (2005-05) - Fixed point implementation for main body and Annex C
-** > Software Release 2.1 (2008-06)
-** (Simple repackaging; no change from 2005-05 Release 2.0 code)
-**
-** � 2004 Polycom, Inc.
-**
-** All rights reserved.
-**
-***********************************************************************/
-
-#include <stdio.h>
-#include <math.h>
-#include <stdlib.h>
-#include "g7221/common/typedef.h"
-#include "g7221/common/basic_op.h"
-
-#define PI 3.141592653589793238462
-
-#define MAX_DCT_LENGTH 640
-#define DCT_LENGTH 320
-#define DCT_LENGTH_DIV_2 160
-#define DCT_LENGTH_DIV_4 80
-#define DCT_LENGTH_DIV_8 40
-#define DCT_LENGTH_DIV_16 20
-#define DCT_LENGTH_DIV_32 10
-#define DCT_LENGTH_DIV_64 5
-
-
-#define MAX(a,b) (a > b ? a : b)
-#define MIN(a,b) (a < b ? a : b)
-
-#define NUM_CATEGORIES 8
-#define NUM_CATEGORIZATION_CONTROL_BITS 4
-#define NUM_CATEGORIZATION_CONTROL_POSSIBILITIES 16
-#define CORE_SIZE 10
-#define DCT_LENGTH_LOG 6
-#define MAX_DCT_LENGTH_LOG 7
-
-/* region_size = (BLOCK_SIZE * 0.875)/NUM_REGIONS; */
-#define NUMBER_OF_REGIONS 14
-#define MAX_NUMBER_OF_REGIONS 28
-#define REGION_SIZE 20
-#define NUMBER_OF_VALID_COEFS (NUMBER_OF_REGIONS * REGION_SIZE)
-#define MAX_NUMBER_OF_VALID_COEFS (MAX_NUMBER_OF_REGIONS * REGION_SIZE)
-
-#define REGION_POWER_TABLE_SIZE 64
-#define REGION_POWER_TABLE_NUM_NEGATIVES 24
-
-#define MAX_NUM_CATEGORIZATION_CONTROL_BITS 5
-#define MAX_NUM_CATEGORIZATION_CONTROL_POSSIBILITIES 32
-
-#define ENCODER_SCALE_FACTOR 18318.0
-
-/* The MLT output is incorrectly scaled by the factor
- product of ENCODER_SCALE_FACTOR and sqrt(160.)
- This is now (9/30/96) 1.0/2^(4.5) or 1/22.627.
- In the current implementation this
- must be an integer power of sqrt(2). The
- integer power is ESF_ADJUSTMENT_TO_RMS_INDEX.
- The -2 is to conform with the range defined in the spec. */
-
-
-#define ESF_ADJUSTMENT_TO_RMS_INDEX (9-2)
-
-
-#define INTERMEDIATE_FILES_FLAG 0
-
-/* Max bit rate is 48000 bits/sec. */
-#define MAX_BITS_PER_FRAME 960
-
-
-/***************************************************************************/
-/* Type definitions */
-/***************************************************************************/
-typedef struct
-{
- Word16 code_bit_count; /* bit count of the current word */
- Word16 current_word; /* current word in the bitstream being processed */
- Word16 *code_word_ptr; /* pointer to the bitstream */
- Word16 number_of_bits_left; /* number of bits left in the current word */
- Word16 next_bit; /* next bit in the current word */
-}Bit_Obj;
-
-typedef struct
-{
- Word16 seed0;
- Word16 seed1;
- Word16 seed2;
- Word16 seed3;
-}Rand_Obj;
-
-/***************************************************************************/
-/* Function definitions */
-/***************************************************************************/
-extern Word16 compute_region_powers(Word16 *mlt_coefs,
- Word16 mag_shift,
- Word16 *drp_num_bits,
- UWord16 *drp_code_bits,
- Word16 *absolute_region_power_index,
- Word16 number_of_regions);
-
-void vector_quantize_mlts(Word16 number_of_available_bits,
- Word16 number_of_regions,
- Word16 num_categorization_control_possibilities,
- Word16 *mlt_coefs,
- Word16 *absolute_region_power_index,
- Word16 *power_categories,
- Word16 *category_balances,
- Word16 *p_categorization_control,
- Word16 *region_mlt_bit_counts,
- UWord32 *region_mlt_bits);
-
-Word16 vector_huffman(Word16 category,
- Word16 power_index,
- Word16 *raw_mlt_ptr,
- UWord32 *word_ptr);
-
-
-void adjust_abs_region_power_index(Word16 *absolute_region_power_index,Word16 *mlt_coefs,Word16 number_of_regions);
-
-void bits_to_words(UWord32 *region_mlt_bits,Word16 *region_mlt_bit_counts,
- Word16 *drp_num_bits,UWord16 *drp_code_bits,Word16 *out_words,
- Word16 categorization_control, Word16 number_of_regions,
- Word16 num_categorization_control_bits, Word16 number_of_bits_per_frame);
-
-void encoder(Word16 number_of_available_bits,
- Word16 number_of_regions,
- Word16 *mlt_coefs,
- Word16 mag_shift,
- Word16 *out_words);
-
-void decoder(Bit_Obj *bitobj,
- Rand_Obj *randobj,
- Word16 number_of_regions,
- Word16 *decoder_mlt_coefs,
- Word16 *p_mag_shift,
- Word16 *p_old_mag_shift,
- Word16 *old_decoder_mlt_coefs,
- Word16 frame_error_flag);
-
-Word16 samples_to_rmlt_coefs(const Word16 *new_samples,Word16 *history,Word16 *coefs,Word16 dct_length);
-void rmlt_coefs_to_samples(Word16 *coefs,
- Word16 *old_samples,
- Word16 *out_samples,
- Word16 dct_length,
- Word16 mag_shift);
-
-Word16 index_to_array(Word16 index,Word16 *array,Word16 category);
-void categorize(Word16 number_of_available_bits,
- Word16 number_of_regions,
- Word16 num_categorization_control_possibilities,
- Word16 *rms_index,
- Word16 *power_categories,
- Word16 *category_balances);
-
-Word16 calc_offset(Word16 *rms_index,Word16 number_of_regions,Word16 available_bits);
-void compute_raw_pow_categories(Word16 *power_categories,Word16 *rms_index,Word16 number_of_regions,Word16 offset);
-void comp_powercat_and_catbalance(Word16 *power_categories,
- Word16 *category_balances,
- Word16 *rms_index,
- Word16 number_of_available_bits,
- Word16 number_of_regions,
- Word16 num_categorization_control_possibilities,
- Word16 offset);
-
-void dct_type_iv_a (Word16 *input,Word16 *output,Word16 dct_length);
-void dct_type_iv_s(Word16 *input,Word16 *output,Word16 dct_length);
-void decode_envelope(Bit_Obj *bitobj,
- Word16 number_of_regions,
- Word16 *decoder_region_standard_deviation,
- Word16 *absolute_region_power_index,
- Word16 *p_mag_shift);
-
-void decode_vector_quantized_mlt_indices(Bit_Obj *bitobj,
- Rand_Obj *randobj,
- Word16 number_of_regions,
- Word16 *decoder_region_standard_deviation,
- Word16 *dedecoder_power_categories,
- Word16 *dedecoder_mlt_coefs);
-
-void rate_adjust_categories(Word16 categorization_control,
- Word16 *decoder_power_categories,
- Word16 *decoder_category_balances);
-
-void get_next_bit(Bit_Obj *bitobj);
-Word16 get_rand(Rand_Obj *randobj);
-
-void test_4_frame_errors(Bit_Obj *bitobj,
- Word16 number_of_regions,
- Word16 num_categorization_control_possibilities,
- Word16 *frame_error_flag,
- Word16 categorization_control,
- Word16 *absolute_region_power_index);
-
-void error_handling(Word16 number_of_coefs,
- Word16 number_of_valid_coefs,
- Word16 *frame_error_flag,
- Word16 *decoder_mlt_coefs,
- Word16 *old_decoder_mlt_coefs,
- Word16 *p_mag_shift,
- Word16 *p_old_mag_shift);
-
-
diff --git a/sflphone-common/libs/pjproject/third_party/g7221/common/huff_def.h b/sflphone-common/libs/pjproject/third_party/g7221/common/huff_def.h
deleted file mode 100644
index dd10d9a5f60f037e3e4916305c4a9359a08f4536..0000000000000000000000000000000000000000
--- a/sflphone-common/libs/pjproject/third_party/g7221/common/huff_def.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/***********************************************************************
-**
-** ITU-T G.722.1 (2005-05) - Fixed point implementation for main body and Annex C
-** > Software Release 2.1 (2008-06)
-** (Simple repackaging; no change from 2005-05 Release 2.0 code)
-**
-** � 2004 Polycom, Inc.
-**
-** All rights reserved.
-**
-***********************************************************************/
-
-#define REGION_POWER_STEPSIZE_DB 3.010299957
-#define ABS_REGION_POWER_LEVELS 32
-#define DIFF_REGION_POWER_LEVELS 24
-
-#define DRP_DIFF_MIN -12
-#define DRP_DIFF_MAX 11
-
-#define MAX_NUM_BINS 16
-#define MAX_VECTOR_INDICES 625
-#define MAX_VECTOR_DIMENSION 5
-
-extern Word16 differential_region_power_bits[MAX_NUMBER_OF_REGIONS][DIFF_REGION_POWER_LEVELS];
-extern UWord16 differential_region_power_codes[MAX_NUMBER_OF_REGIONS][DIFF_REGION_POWER_LEVELS];
-extern Word16 differential_region_power_decoder_tree[MAX_NUMBER_OF_REGIONS][DIFF_REGION_POWER_LEVELS-1][2];
-extern Word16 mlt_quant_centroid[NUM_CATEGORIES][MAX_NUM_BINS];
-extern Word16 expected_bits_table[NUM_CATEGORIES];
-extern Word16 mlt_sqvh_bitcount_category_0[196];
-extern UWord16 mlt_sqvh_code_category_0[196];
-extern Word16 mlt_sqvh_bitcount_category_1[100];
-extern UWord16 mlt_sqvh_code_category_1[100];
-extern Word16 mlt_sqvh_bitcount_category_2[49];
-extern UWord16 mlt_sqvh_code_category_2[49];
-extern Word16 mlt_sqvh_bitcount_category_3[625];
-extern UWord16 mlt_sqvh_code_category_3[625];
-extern Word16 mlt_sqvh_bitcount_category_4[256];
-extern UWord16 mlt_sqvh_code_category_4[256];
-extern Word16 mlt_sqvh_bitcount_category_5[243];
-extern UWord16 mlt_sqvh_code_category_5[243];
-extern Word16 mlt_sqvh_bitcount_category_6[32];
-extern UWord16 mlt_sqvh_code_category_6[32];
-extern Word16 *table_of_bitcount_tables[NUM_CATEGORIES-1];
-extern UWord16 *table_of_code_tables[NUM_CATEGORIES-1];
-extern Word16 mlt_decoder_tree_category_0[180][2];
-extern Word16 mlt_decoder_tree_category_1[93][2];
-extern Word16 mlt_decoder_tree_category_2[47][2];
-extern Word16 mlt_decoder_tree_category_3[519][2];
-extern Word16 mlt_decoder_tree_category_4[208][2];
-extern Word16 mlt_decoder_tree_category_5[191][2];
-extern Word16 mlt_decoder_tree_category_6[31][2];
-extern Word16 *table_of_decoder_tables[NUM_CATEGORIES-1];
-
diff --git a/sflphone-common/libs/pjproject/third_party/g7221/common/huff_tab.c b/sflphone-common/libs/pjproject/third_party/g7221/common/huff_tab.c
deleted file mode 100644
index 12ff661cc8afd68321224f1d0d731783819089ed..0000000000000000000000000000000000000000
--- a/sflphone-common/libs/pjproject/third_party/g7221/common/huff_tab.c
+++ /dev/null
@@ -1,528 +0,0 @@
-/***********************************************************************
-**
-** ITU-T G.722.1 (2005-05) - Fixed point implementation for main body and Annex C
-** > Software Release 2.1 (2008-06)
-** (Simple repackaging; no change from 2005-05 Release 2.0 code)
-**
-** � 2004 Polycom, Inc.
-**
-** All rights reserved.
-**
-***********************************************************************/
-#include "defs.h"
-#include "huff_def.h"
-
-Word16 differential_region_power_bits[MAX_NUMBER_OF_REGIONS][DIFF_REGION_POWER_LEVELS] = {
-{99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99},
-{ 4, 6, 5, 5, 4, 4, 4, 4, 4, 4, 3, 3, 3, 4, 5, 7, 8, 9,11,11,12,12,12,12},
-{10, 8, 6, 5, 5, 4, 3, 3, 3, 3, 3, 3, 4, 5, 7, 9,11,12,13,15,15,15,16,16},
-{12,10, 8, 6, 5, 4, 4, 4, 4, 4, 4, 3, 3, 3, 4, 4, 5, 5, 7, 9,11,13,14,14},
-{13,10, 9, 9, 7, 7, 5, 5, 4, 3, 3, 3, 3, 3, 4, 4, 4, 5, 7, 9,11,13,13,13},
-{12,13,10, 8, 6, 6, 5, 5, 4, 4, 3, 3, 3, 3, 3, 4, 5, 5, 6, 7, 9,11,14,14},
-{12,11, 9, 8, 8, 7, 5, 4, 4, 3, 3, 3, 3, 3, 4, 4, 5, 5, 7, 8,10,13,14,14},
-{15,16,15,12,10, 8, 6, 5, 4, 3, 3, 3, 2, 3, 4, 5, 5, 7, 9,11,13,16,16,16},
-{14,14,11,10, 9, 7, 7, 5, 5, 4, 3, 3, 2, 3, 3, 4, 5, 7, 9, 9,12,14,15,15},
-{ 9, 9, 9, 8, 7, 6, 5, 4, 3, 3, 3, 3, 3, 3, 4, 5, 6, 7, 8,10,11,12,13,13},
-{14,12,10, 8, 6, 6, 5, 4, 3, 3, 3, 3, 3, 3, 4, 5, 6, 8, 8, 9,11,14,14,14},
-{13,10, 9, 8, 6, 6, 5, 4, 4, 4, 3, 3, 2, 3, 4, 5, 6, 8, 9, 9,11,12,14,14},
-{16,13,12,11, 9, 6, 5, 5, 4, 4, 4, 3, 2, 3, 3, 4, 5, 7, 8,10,14,16,16,16},
-{13,14,14,14,10, 8, 7, 7, 5, 4, 3, 3, 2, 3, 3, 4, 5, 5, 7, 9,11,14,14,14},
-{13,14,14,14,10, 8, 7, 7, 5, 4, 3, 3, 2, 3, 3, 4, 5, 5, 7, 9,11,14,14,14},
-{13,14,14,14,10, 8, 7, 7, 5, 4, 3, 3, 2, 3, 3, 4, 5, 5, 7, 9,11,14,14,14},
-{13,14,14,14,10, 8, 7, 7, 5, 4, 3, 3, 2, 3, 3, 4, 5, 5, 7, 9,11,14,14,14},
-{13,14,14,14,10, 8, 7, 7, 5, 4, 3, 3, 2, 3, 3, 4, 5, 5, 7, 9,11,14,14,14},
-{13,14,14,14,10, 8, 7, 7, 5, 4, 3, 3, 2, 3, 3, 4, 5, 5, 7, 9,11,14,14,14},
-{13,14,14,14,10, 8, 7, 7, 5, 4, 3, 3, 2, 3, 3, 4, 5, 5, 7, 9,11,14,14,14},
-{13,14,14,14,10, 8, 7, 7, 5, 4, 3, 3, 2, 3, 3, 4, 5, 5, 7, 9,11,14,14,14},
-{13,14,14,14,10, 8, 7, 7, 5, 4, 3, 3, 2, 3, 3, 4, 5, 5, 7, 9,11,14,14,14},
-{13,14,14,14,10, 8, 7, 7, 5, 4, 3, 3, 2, 3, 3, 4, 5, 5, 7, 9,11,14,14,14},
-{13,14,14,14,10, 8, 7, 7, 5, 4, 3, 3, 2, 3, 3, 4, 5, 5, 7, 9,11,14,14,14},
-{13,14,14,14,10, 8, 7, 7, 5, 4, 3, 3, 2, 3, 3, 4, 5, 5, 7, 9,11,14,14,14},
-{13,14,14,14,10, 8, 7, 7, 5, 4, 3, 3, 2, 3, 3, 4, 5, 5, 7, 9,11,14,14,14},
-{13,14,14,14,10, 8, 7, 7, 5, 4, 3, 3, 2, 3, 3, 4, 5, 5, 7, 9,11,14,14,14},
-{13,14,14,14,10, 8, 7, 7, 5, 4, 3, 3, 2, 3, 3, 4, 5, 5, 7, 9,11,14,14,14}};
-
-UWord16 differential_region_power_codes[MAX_NUMBER_OF_REGIONS][DIFF_REGION_POWER_LEVELS] = {
-{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-{ 8,38,18,10, 7, 6, 3, 2, 0, 1, 7, 6, 5, 4,11,78,158,318,1278,1279,2552,2553,2554,2555},
-{36, 8, 3, 5, 0, 1, 7, 6, 4, 3, 2, 5, 3, 4, 5,19,74,150,302,1213,1214,1215,2424,2425},
-{2582,644,160,41, 5,11, 7, 5, 4, 1, 0, 6, 4, 7, 3, 6, 4,21,81,323,1290,5167,10332,10333},
-{2940,366,181,180,47,46,27,10, 8, 5, 1, 0, 3, 7, 4, 9,12,26,44,182,734,2941,2942,2943},
-{3982,7967,994,249,63,26,19,18,14, 8, 6, 1, 0, 2, 5, 7,12,30,27,125,496,1990,15932,15933},
-{3254,1626,407,206,202,100,30,14, 3, 5, 3, 0, 2, 4, 2,13,24,31,102,207,812,6511,13020,13021},
-{1110,2216,1111,139,35, 9, 3,20,11, 4, 2, 1, 3, 3, 1, 0,21, 5,16,68,276,2217,2218,2219},
-{1013,1014,127,62,29, 6, 4,16, 0, 1, 3, 2, 3, 1, 5, 9,17, 5,28,30,252,1015,2024,2025},
-{381,380,372,191,94,44,16,10, 7, 3, 1, 0, 2, 6, 9,17,45,92,187,746,1494,2991,5980,5981},
-{3036,758,188,45,43,10, 4, 3, 6, 4, 2, 0, 3, 7,11,20,42,44,46,95,378,3037,3038,3039},
-{751,92,45,20,26, 4,12, 7, 4, 0, 4, 1, 3, 5, 5, 3,27,21,44,47,186,374,1500,1501},
-{45572U,5697,2849,1425,357,45,23, 6,10, 7, 2, 2, 3, 0, 4, 6, 7,88,179,713,11392,45573U,45574U,45575U},
-{2511,5016,5018,5017,312,79,38,36,30,14, 6, 0, 2, 1, 3, 5, 8,31,37,157,626,5019,5020,5021},
-{2511,5016,5018,5017,312,79,38,36,30,14, 6, 0, 2, 1, 3, 5, 8,31,37,157,626,5019,5020,5021},
-{2511,5016,5018,5017,312,79,38,36,30,14, 6, 0, 2, 1, 3, 5, 8,31,37,157,626,5019,5020,5021},
-{2511,5016,5018,5017,312,79,38,36,30,14, 6, 0, 2, 1, 3, 5, 8,31,37,157,626,5019,5020,5021},
-{2511,5016,5018,5017,312,79,38,36,30,14, 6, 0, 2, 1, 3, 5, 8,31,37,157,626,5019,5020,5021},
-{2511,5016,5018,5017,312,79,38,36,30,14, 6, 0, 2, 1, 3, 5, 8,31,37,157,626,5019,5020,5021},
-{2511,5016,5018,5017,312,79,38,36,30,14, 6, 0, 2, 1, 3, 5, 8,31,37,157,626,5019,5020,5021},
-{2511,5016,5018,5017,312,79,38,36,30,14, 6, 0, 2, 1, 3, 5, 8,31,37,157,626,5019,5020,5021},
-{2511,5016,5018,5017,312,79,38,36,30,14, 6, 0, 2, 1, 3, 5, 8,31,37,157,626,5019,5020,5021},
-{2511,5016,5018,5017,312,79,38,36,30,14, 6, 0, 2, 1, 3, 5, 8,31,37,157,626,5019,5020,5021},
-{2511,5016,5018,5017,312,79,38,36,30,14, 6, 0, 2, 1, 3, 5, 8,31,37,157,626,5019,5020,5021},
-{2511,5016,5018,5017,312,79,38,36,30,14, 6, 0, 2, 1, 3, 5, 8,31,37,157,626,5019,5020,5021},
-{2511,5016,5018,5017,312,79,38,36,30,14, 6, 0, 2, 1, 3, 5, 8,31,37,157,626,5019,5020,5021},
-{2511,5016,5018,5017,312,79,38,36,30,14, 6, 0, 2, 1, 3, 5, 8,31,37,157,626,5019,5020,5021},
-{2511,5016,5018,5017,312,79,38,36,30,14, 6, 0, 2, 1, 3, 5, 8,31,37,157,626,5019,5020,5021}};
-
-Word16 differential_region_power_decoder_tree[MAX_NUMBER_OF_REGIONS][DIFF_REGION_POWER_LEVELS-1][2] = {
-{{ 0, 0},{ 0, 0},{ 0, 0},{ 0, 0},{ 0, 0},{ 0, 0},{ 0, 0},{ 0, 0},{ 0, 0},{ 0, 0},{ 0, 0},{ 0, 0},{ 0, 0},{ 0, 0},{ 0, 0},{ 0, 0},{ 0, 0},{ 0, 0},{ 0, 0},{ 0, 0},{ 0, 0},{ 0, 0},{ 0, 0}},
-{{ 1, 2},{ 3, 4},{ 5, 6},{ 7, 8},{ 9, 10},{ 11,-12},{-11,-10},{ -8, -9},{ -7, -6},{-13, 12},{ -5, -4},{ 0, 13},{ -3,-14},{ -2, 14},{ -1, 15},{-15, 16},{-16, 17},{-17, 18},{ 19, 20},{ 21, 22},{-18,-19},{-20,-21},{-22,-23}},
-{{ 1, 2},{ 3, 4},{ 5, 6},{ 7, 8},{-10, -9},{ -8,-11},{ -7, -6},{ 9, -5},{ 10,-12},{ -4, 11},{-13, -3},{ 12, -2},{ 13,-14},{ -1, 14},{ 15,-15},{ 0, 16},{-16, 17},{-17, 18},{-18, 19},{ 20, 21},{ 22,-19},{-20,-21},{-22,-23}},
-{{ 1, 2},{ 3, 4},{ 5, 6},{ 7, 8},{ 9, 10},{-12, 11},{-11,-13},{-10, -9},{ 12,-14},{ -8, -7},{-15, -6},{ 13, -5},{-16, -4},{ 14,-17},{ 15, -3},{ 16,-18},{ -2, 17},{ 18,-19},{ -1, 19},{-20, 20},{ 0, 21},{ 22,-21},{-22,-23}},
-{{ 1, 2},{ 3, 4},{ 5, 6},{-11,-10},{ 7,-12},{ 8, -9},{ 9,-13},{-14, 10},{ -8,-15},{-16, 11},{ -7, 12},{-17, -6},{ 13, 14},{-18, 15},{ -5, -4},{ 16, 17},{ -3, -2},{-19, 18},{ -1, 19},{-20, 20},{ 21, 22},{ 0,-21},{-22,-23}},
-{{ 1, 2},{ 3, 4},{ 5, 6},{-12,-11},{-13, 7},{ 8,-14},{-10, 9},{ 10,-15},{ -9, 11},{ -8, 12},{-16, 13},{ -7, -6},{-17, 14},{ -5,-18},{ 15, -4},{ 16,-19},{ 17, -3},{-20, 18},{ -2, 19},{-21, 20},{ 0, 21},{ 22, -1},{-22,-23}},
-{{ 1, 2},{ 3, 4},{ 5, 6},{-11, 7},{-12,-10},{-13, -9},{ 8, 9},{-14, -8},{ 10,-15},{ -7, 11},{-16, 12},{ -6,-17},{ 13, 14},{ -5, 15},{-18, 16},{ -4, 17},{ -3,-19},{ 18, -2},{-20, 19},{ -1, 20},{ 0, 21},{ 22,-21},{-22,-23}},
-{{ 1, 2},{ 3, 4},{ 5,-12},{ 6,-11},{-10,-13},{ -9, 7},{ 8,-14},{ 9, -8},{-15, 10},{ -7,-16},{ 11, -6},{ 12,-17},{ 13, -5},{-18, 14},{ 15, -4},{-19, 16},{ 17, -3},{-20, 18},{ 19, 20},{ 21, 22},{ 0, -2},{ -1,-21},{-22,-23}},
-{{ 1, 2},{ 3, 4},{ 5,-12},{ 6,-13},{-11,-10},{ 7,-14},{ 8, -9},{ 9,-15},{ -8, 10},{ -7,-16},{ 11, 12},{ -6,-17},{ -5, 13},{ 14, 15},{-18, -4},{-19, 16},{ -3, 17},{ 18, -2},{-20, 19},{ 20, 21},{ 22, 0},{ -1,-21},{-22,-23}},
-{{ 1, 2},{ 3, 4},{ 5, 6},{-11,-10},{-12, -9},{ 7, 8},{-13, -8},{ 9,-14},{ -7, 10},{ -6,-15},{ 11, 12},{ -5,-16},{ 13, 14},{-17, 15},{ -4, 16},{ 17,-18},{ 18, -3},{ -2, 19},{ -1, 0},{-19, 20},{-20, 21},{ 22,-21},{-22,-23}},
-{{ 1, 2},{ 3, 4},{ 5, 6},{-11, 7},{-10,-12},{ -9, 8},{ -8,-13},{ 9, -7},{ 10,-14},{ -6, 11},{-15, 12},{ -5, 13},{-16, -4},{ 14, 15},{-17, -3},{-18, 16},{ 17,-19},{ -2, 18},{-20, 19},{ -1, 20},{ 21, 22},{ 0,-21},{-22,-23}},
-{{ 1, 2},{ 3, 4},{ 5,-12},{ 6,-11},{ 7, 8},{-10,-13},{ -9, 9},{ -8,-14},{ 10, -7},{ 11,-15},{ -6, 12},{ -5, 13},{ -4,-16},{ 14, 15},{ -3,-17},{ 16, 17},{-18, -2},{ 18,-19},{ -1, 19},{-20, 20},{-21, 21},{ 22, 0},{-22,-23}},
-{{ 1, 2},{ 3, 4},{ 5,-12},{-13, 6},{-11, 7},{-14, 8},{-10, 9},{-15, -9},{ -8, 10},{ -7,-16},{ 11, -6},{ 12, -5},{-17, 13},{ 14,-18},{ 15, -4},{ 16,-19},{ 17, -3},{ 18, -2},{ 19, -1},{-20, 20},{ 21, 22},{ 0,-21},{-22,-23}},
-{{ 1, 2},{ 3, 4},{-12, 5},{-11,-13},{ 6,-14},{-10, 7},{ 8,-15},{ -9, 9},{-16, 10},{ -8,-17},{ 11, 12},{ -7,-18},{ -6, 13},{ 14, -5},{ 15,-19},{ -4, 16},{-20, 17},{ 18, 19},{ 20, 21},{ 22, 0},{ -1, -3},{ -2,-21},{-22,-23}},
-{{ 1, 2},{ 3, 4},{-12, 5},{-11,-13},{ 6,-14},{-10, 7},{ 8,-15},{ -9, 9},{-16, 10},{ -8,-17},{ 11, 12},{ -7,-18},{ -6, 13},{ 14, -5},{ 15,-19},{ -4, 16},{-20, 17},{ 18, 19},{ 20, 21},{ 22, 0},{ -1, -3},{ -2,-21},{-22,-23}},
-{{ 1, 2},{ 3, 4},{-12, 5},{-11,-13},{ 6,-14},{-10, 7},{ 8,-15},{ -9, 9},{-16, 10},{ -8,-17},{ 11, 12},{ -7,-18},{ -6, 13},{ 14, -5},{ 15,-19},{ -4, 16},{-20, 17},{ 18, 19},{ 20, 21},{ 22, 0},{ -1, -3},{ -2,-21},{-22,-23}},
-{{ 1, 2},{ 3, 4},{-12, 5},{-11,-13},{ 6,-14},{-10, 7},{ 8,-15},{ -9, 9},{-16, 10},{ -8,-17},{ 11, 12},{ -7,-18},{ -6, 13},{ 14, -5},{ 15,-19},{ -4, 16},{-20, 17},{ 18, 19},{ 20, 21},{ 22, 0},{ -1, -3},{ -2,-21},{-22,-23}},
-{{ 1, 2},{ 3, 4},{-12, 5},{-11,-13},{ 6,-14},{-10, 7},{ 8,-15},{ -9, 9},{-16, 10},{ -8,-17},{ 11, 12},{ -7,-18},{ -6, 13},{ 14, -5},{ 15,-19},{ -4, 16},{-20, 17},{ 18, 19},{ 20, 21},{ 22, 0},{ -1, -3},{ -2,-21},{-22,-23}},
-{{ 1, 2},{ 3, 4},{-12, 5},{-11,-13},{ 6,-14},{-10, 7},{ 8,-15},{ -9, 9},{-16, 10},{ -8,-17},{ 11, 12},{ -7,-18},{ -6, 13},{ 14, -5},{ 15,-19},{ -4, 16},{-20, 17},{ 18, 19},{ 20, 21},{ 22, 0},{ -1, -3},{ -2,-21},{-22,-23}},
-{{ 1, 2},{ 3, 4},{-12, 5},{-11,-13},{ 6,-14},{-10, 7},{ 8,-15},{ -9, 9},{-16, 10},{ -8,-17},{ 11, 12},{ -7,-18},{ -6, 13},{ 14, -5},{ 15,-19},{ -4, 16},{-20, 17},{ 18, 19},{ 20, 21},{ 22, 0},{ -1, -3},{ -2,-21},{-22,-23}},
-{{ 1, 2},{ 3, 4},{-12, 5},{-11,-13},{ 6,-14},{-10, 7},{ 8,-15},{ -9, 9},{-16, 10},{ -8,-17},{ 11, 12},{ -7,-18},{ -6, 13},{ 14, -5},{ 15,-19},{ -4, 16},{-20, 17},{ 18, 19},{ 20, 21},{ 22, 0},{ -1, -3},{ -2,-21},{-22,-23}},
-{{ 1, 2},{ 3, 4},{-12, 5},{-11,-13},{ 6,-14},{-10, 7},{ 8,-15},{ -9, 9},{-16, 10},{ -8,-17},{ 11, 12},{ -7,-18},{ -6, 13},{ 14, -5},{ 15,-19},{ -4, 16},{-20, 17},{ 18, 19},{ 20, 21},{ 22, 0},{ -1, -3},{ -2,-21},{-22,-23}},
-{{ 1, 2},{ 3, 4},{-12, 5},{-11,-13},{ 6,-14},{-10, 7},{ 8,-15},{ -9, 9},{-16, 10},{ -8,-17},{ 11, 12},{ -7,-18},{ -6, 13},{ 14, -5},{ 15,-19},{ -4, 16},{-20, 17},{ 18, 19},{ 20, 21},{ 22, 0},{ -1, -3},{ -2,-21},{-22,-23}},
-{{ 1, 2},{ 3, 4},{-12, 5},{-11,-13},{ 6,-14},{-10, 7},{ 8,-15},{ -9, 9},{-16, 10},{ -8,-17},{ 11, 12},{ -7,-18},{ -6, 13},{ 14, -5},{ 15,-19},{ -4, 16},{-20, 17},{ 18, 19},{ 20, 21},{ 22, 0},{ -1, -3},{ -2,-21},{-22,-23}},
-{{ 1, 2},{ 3, 4},{-12, 5},{-11,-13},{ 6,-14},{-10, 7},{ 8,-15},{ -9, 9},{-16, 10},{ -8,-17},{ 11, 12},{ -7,-18},{ -6, 13},{ 14, -5},{ 15,-19},{ -4, 16},{-20, 17},{ 18, 19},{ 20, 21},{ 22, 0},{ -1, -3},{ -2,-21},{-22,-23}},
-{{ 1, 2},{ 3, 4},{-12, 5},{-11,-13},{ 6,-14},{-10, 7},{ 8,-15},{ -9, 9},{-16, 10},{ -8,-17},{ 11, 12},{ -7,-18},{ -6, 13},{ 14, -5},{ 15,-19},{ -4, 16},{-20, 17},{ 18, 19},{ 20, 21},{ 22, 0},{ -1, -3},{ -2,-21},{-22,-23}},
-{{ 1, 2},{ 3, 4},{-12, 5},{-11,-13},{ 6,-14},{-10, 7},{ 8,-15},{ -9, 9},{-16, 10},{ -8,-17},{ 11, 12},{ -7,-18},{ -6, 13},{ 14, -5},{ 15,-19},{ -4, 16},{-20, 17},{ 18, 19},{ 20, 21},{ 22, 0},{ -1, -3},{ -2,-21},{-22,-23}},
-{{ 1, 2},{ 3, 4},{-12, 5},{-11,-13},{ 6,-14},{-10, 7},{ 8,-15},{ -9, 9},{-16, 10},{ -8,-17},{ 11, 12},{ -7,-18},{ -6, 13},{ 14, -5},{ 15,-19},{ -4, 16},{-20, 17},{ 18, 19},{ 20, 21},{ 22, 0},{ -1, -3},{ -2,-21},{-22,-23}}};
-
-Word16 mlt_quant_centroid[NUM_CATEGORIES][MAX_NUM_BINS] = {
-{ 0, 1606, 3119, 4586, 6049, 7502, 8941,10406,11851,13292,14736,16146,17566,19351, 0, 0},
-{ 0, 2229, 4341, 6401, 8471,10531,12583,14588,16673,18924, 0, 0, 0, 0, 0, 0},
-{ 0, 3055, 5998, 8929,11806,14680,17680, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-{ 0, 4121, 8192,12259,16322, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-{ 0, 5413,11071,16315, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-{ 0, 6785,14300, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-{ 0, 8044, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-{ 0, 8019, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}};
-
-Word16 expected_bits_table[NUM_CATEGORIES] = {52, 47, 43, 37, 29, 22, 16, 0};
-
-
-Word16 mlt_sqvh_bitcount_category_0[196] = {
- 1, 4, 6, 6, 7, 7, 8, 8, 8, 9, 9,10,11,11, 4, 5,
- 6, 7, 7, 8, 8, 9, 9, 9, 9,10,11,11, 5, 6, 7, 8,
- 8, 9, 9, 9, 9,10,10,10,11,12, 6, 7, 8, 9, 9, 9,
- 9,10,10,10,10,11,12,13, 7, 7, 8, 9, 9, 9,10,10,
-10,10,11,11,12,13, 8, 8, 9, 9, 9,10,10,10,10,11,
-11,12,13,14, 8, 8, 9, 9,10,10,11,11,11,12,12,13,
-13,15, 8, 8, 9, 9,10,10,11,11,11,12,12,13,14,15,
- 9, 9, 9,10,10,10,11,11,12,13,12,14,15,16, 9, 9,
-10,10,10,10,11,12,12,14,14,16,16,16, 9, 9,10,10,
-11,11,12,13,13,14,14,15,15,16,10,10,10,11,11,12,
-12,13,15,15,16,14,15,15,11,11,11,12,13,13,13,15,
-16,16,16,16,14,15,11,11,12,13,13,14,15,16,16,16,
-16,16,16,14};
-UWord16 mlt_sqvh_code_category_0[196] = {
- 1, 2, 1, 24, 14, 51, 9, 68, 110, 26, 218, 54, 154, 761, 3, 10,
- 22, 8, 58, 22, 71, 16, 30, 50, 213, 75, 94, 632, 15, 18, 52, 23,
- 107, 5, 54, 63, 239, 46, 276, 271, 851, 252, 28, 10, 12, 1, 22, 133,
- 191, 55, 105, 278, 317, 554, 310, 276, 32, 50, 94, 20, 187, 219, 13, 268,
- 473, 445, 145, 849, 1277, 623, 1, 14, 0, 55, 238, 121, 120, 269, 318, 530,
- 639, 1117, 509, 556, 24, 78, 51, 153, 62, 308, 16, 25, 68, 1058, 428, 277,
- 2233, 1114, 92, 108, 141, 223, 270, 381, 24, 212, 760, 35, 1063, 279, 1717, 3439,
- 7, 21, 152, 73, 309, 310, 95, 944, 1890, 2232, 1891, 5107,10213, 4981, 61, 62,
- 9, 79, 474, 475, 848, 1059, 1056, 1716, 139, 4978, 4983, 4983, 140, 186, 76, 444,
- 144, 633, 1057, 838, 2237, 4472, 4473,10212,10212, 4983, 74, 78, 311, 213, 850, 1062,
- 1119, 508, 276, 277, 4982, 4473,10212,10212, 208, 70, 555, 418, 68, 510, 2552, 1115,
- 4980, 4979, 4982, 4982, 4473,10212, 215, 71, 253, 511, 839, 1718, 2488, 6876, 6877, 4979,
- 4979, 4982, 4982, 4473};
-Word16 mlt_sqvh_bitcount_category_1[100] = {
- 1, 4, 5, 6, 7, 8, 8, 9,10,10, 4, 5, 6, 7, 7, 8,
- 8, 9, 9,11, 5, 5, 6, 7, 8, 8, 9, 9,10,11, 6, 6,
- 7, 8, 8, 9, 9,10,11,12, 7, 7, 8, 8, 9, 9,10,11,
-11,13, 8, 8, 8, 9, 9,10,10,11,12,14, 8, 8, 8, 9,
-10,11,11,12,13,15, 9, 9, 9,10,11,12,12,14,14,14,
- 9, 9, 9,10,11,12,14,16,14,14,10,10,11,12,13,14,
-16,16,16,14};
-UWord16 mlt_sqvh_code_category_1[100] = {
- 1, 2, 11, 27, 31, 9, 120, 31, 275, 310, 1, 0, 12, 5, 33, 54,
- 102, 111, 246, 448, 10, 14, 31, 39, 59, 100, 114, 202, 485, 969, 24, 26,
- 36, 52, 103, 30, 120, 242, 69, 1244, 35, 32, 14, 61, 113, 117, 233, 486,
- 487, 2491, 13, 12, 69, 110, 149, 35, 495, 449, 1978, 7751, 76, 75, 122, 136,
- 213, 68, 623, 930, 3959, 9961, 115, 16, 107, 225, 424, 850, 1936, 7916, 4981, 4981,
- 148, 154, 243, 407, 988, 851, 7750,19920, 7916, 4981, 406, 274, 464, 931, 3874, 7917,
-19921,19920,19920, 7916};
-Word16 mlt_sqvh_bitcount_category_2[49] = {
- 1, 4, 5, 7, 8, 9,10, 3, 4, 5, 7, 8, 9,10, 5, 5,
- 6, 7, 8,10,10, 7, 6, 7, 8, 9,10,12, 8, 8, 8, 9,
-10,12,14, 8, 9, 9,10,11,15,16, 9,10,11,12,13,16,
-15};
-UWord16 mlt_sqvh_code_category_2[49] = {
- 1, 0, 10, 11, 28, 62, 363, 3, 2, 9, 8, 24, 53, 352, 7, 8,
- 13, 25, 89, 74, 355, 10, 23, 24, 29, 55, 354, 1449, 25, 19, 30, 52,
- 108, 438, 5793, 91, 36, 63, 353, 725,11584,23170, 180, 75, 218, 439, 2897,23171,
-11584};
-Word16 mlt_sqvh_bitcount_category_3[625] = {
- 2, 4, 6, 8,10, 5, 5, 6, 8,10, 7, 8, 8,10,12, 9,
- 9,10,12,15,10,11,13,16,16, 5, 6, 8,10,11, 5, 6,
- 8,10,12, 7, 7, 8,10,13, 9, 9,10,12,15,12,11,13,
-16,16, 7, 9,10,12,15, 7, 8,10,12,13, 9, 9,11,13,
-16,11,11,12,14,16,12,12,14,16,14, 9,11,12,16,16,
- 9,10,13,15,16,10,11,12,16,16,13,13,16,16,16,16,
-16,15,16,16,11,13,16,16,15,11,13,15,16,16,13,13,
-16,16,16,14,16,16,16,16,16,16,16,16,16, 4, 6, 8,
-10,13, 6, 6, 8,10,13, 9, 8,10,12,16,10,10,11,15,
-16,13,12,14,16,16, 5, 6, 8,11,13, 6, 6, 8,10,13,
- 8, 8, 9,11,14,10,10,12,12,16,13,12,13,15,16, 7,
- 8, 9,12,16, 7, 8,10,12,14, 9, 9,10,13,16,11,10,
-12,15,16,13,13,16,16,15, 9,11,13,16,16, 9,10,12,
-15,16,10,11,13,16,16,13,12,16,16,16,16,16,16,16,
-16,11,13,16,16,16,11,13,16,16,16,12,13,15,16,16,
-16,16,16,16,16,16,16,16,16,16, 6, 8,11,13,16, 8,
- 8,10,12,16,11,10,11,13,16,12,13,13,15,16,16,16,
-14,16,15, 6, 8,10,13,16, 8, 8,10,12,16,10,10,11,
-13,16,13,12,13,16,16,14,14,14,16,16, 8, 9,11,13,
-16, 8, 9,11,16,14,10,10,12,15,16,12,12,13,16,16,
-15,16,16,16,16,10,12,15,16,16,10,12,12,14,16,12,
-12,13,16,16,14,15,16,16,16,16,16,16,16,16,12,15,
-15,16,16,13,13,16,16,14,14,16,16,16,16,16,16,16,
-16,16,14,15,16,16,16, 8,10,13,15,16,10,11,13,16,
-16,13,13,14,16,16,16,16,16,16,16,16,16,16,16,16,
- 8,10,11,15,16, 9,10,12,16,16,12,12,15,16,16,16,
-14,16,16,16,16,16,16,16,16, 9,11,14,16,16,10,11,
-13,16,16,14,13,14,16,16,16,15,15,16,16,16,16,16,
-16,16,11,13,16,16,16,11,13,15,16,16,13,16,16,16,
-16,16,16,16,16,16,16,16,16,16,16,15,16,16,16,16,
-14,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-16,16,16,16, 9,13,16,16,16,11,13,16,16,16,14,15,
-16,16,16,15,16,16,16,16,16,16,16,16,16, 9,13,15,
-15,16,12,13,14,16,16,16,15,16,16,16,16,16,16,16,
-16,16,16,16,16,16,11,13,15,16,16,12,14,16,16,16,
-16,16,16,16,16,16,16,16,16,16,16,15,15,16,16,16,
-16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,15,
-16,16,13,16,16,16,16,16,16,16,16,16,16,16,16,16,
-16};
-UWord16 mlt_sqvh_code_category_3[625] = {
- 3, 8, 46, 145, 228, 4, 8, 47, 28, 455, 89, 2, 180, 5, 1335, 250,
- 12, 644, 1311, 139, 729, 251, 870, 2172, 2211, 5, 23, 112, 334, 1469, 21, 3,
- 5, 111, 2014, 88, 79, 152, 124, 2685, 297, 48, 110, 1310, 149, 501, 1231, 153,
- 2267, 2569, 57, 13, 653, 2587, 143, 75, 124, 118, 2611, 5242, 61, 50, 253, 3633,
- 2216, 476, 39, 57, 1926, 2236, 2586, 1329, 1920, 2566, 1926, 296, 233, 2590, 2240, 2217,
- 253, 613, 867, 144, 318, 614, 252, 2589, 2242, 2218, 872, 866, 2187, 2296, 2155, 2568,
- 2227, 150, 2567, 2296, 199, 2686, 2160, 2290,19145, 232, 2680, 128, 2192, 2212, 2684, 793,
- 2281, 2223, 2242, 1934, 2165, 2146, 2291, 2296, 2222, 2189, 2187, 2296, 2296, 6, 4, 82,
- 725, 3632, 15, 21, 56, 599, 148, 3, 162, 42, 411, 2301, 735, 654, 930, 137,
- 2586, 869, 1334, 1931, 2300, 2213, 9, 22, 146, 1290, 5240, 5, 12, 53, 630, 875,
- 80, 9, 8, 86, 2002, 210, 117, 56, 2019, 2162, 146, 397, 868, 131, 2151, 77,
- 160, 365, 2610, 2252, 59, 54, 41, 2591, 1928, 226, 14, 121, 5792, 2295, 1197, 728,
- 408, 130, 2157, 3635, 155, 2573, 2587, 130, 314, 64, 144, 2173, 2176, 115, 30, 409,
- 153, 2590, 631, 26, 4787, 2221, 2174, 2683, 1863, 2572, 319, 2150, 2177, 2194, 2571, 2257,
- 319, 65, 145, 2251, 2156, 2161, 909, 864, 2193, 2197, 2246, 2588, 5797, 156, 2258, 2221,
- 2158, 2199, 2214, 2152, 319, 2188, 2264, 2572, 319, 319, 30, 117, 219, 865, 2263, 147,
- 127, 239, 410, 2247, 27, 324, 1468, 2681, 2180, 1328, 5241, 147, 142, 2237, 2241, 2245,
- 1921, 2262, 142, 41, 11, 505, 2682, 2591, 0, 26, 229, 2015, 2577, 464, 98, 87,
- 5243, 2166, 149, 2016, 5244, 2190, 2198, 9573,11598,11599, 2235, 2190, 144, 298, 1004, 5245,
- 2277, 156, 104, 254, 2560, 1922, 612, 325, 2017, 129, 2588, 2608, 1330, 871, 2144, 2145,
- 132, 2147, 2148, 2149, 2144, 119, 1331, 133, 2153, 2154, 211, 58, 2609, 1923, 2159, 510,
- 163, 5246, 2163, 2164, 1924, 134, 2167, 2168, 2168, 2169, 2170, 2171, 2168, 2168, 1332, 135,
- 136, 2175, 2153, 150, 873, 2178, 2179, 1923, 1925, 2181, 2182, 2183, 2163, 2184, 2185, 2186,
- 2168, 2168, 1924, 134, 2167, 2168, 2168, 58, 326, 2687, 138, 2191, 31, 66, 874, 2195,
- 2196, 151, 152, 1927, 2200, 2201, 2202, 2203, 2204, 2205, 2206, 2207, 2208, 2209, 2210, 2205,
- 55, 103, 1230, 140, 2215, 118, 15, 1333, 2219, 2220, 2018, 511, 141, 2224, 2225, 2226,
- 1929, 2228, 2229, 2230, 2231, 2232, 2233, 2234, 2229, 366, 1005, 1930, 2238, 2239, 12, 1006,
- 5247, 2243, 2244, 1932, 3634, 1933, 2248, 2249, 2250, 145, 146, 2253, 2253, 2254, 2255, 2256,
- 2253, 2253, 1291, 5793, 2259, 2260, 2261, 477, 5794, 147, 2265, 2266, 5795, 2268, 2269, 2270,
- 2270, 2271, 2272, 2273, 2274, 2274, 2275, 2276, 2273, 2274, 2274, 148, 2278, 2279, 2280, 2260,
- 1935, 2282, 2283, 2284, 2265, 2285, 2286, 2287, 2270, 2270, 2288, 2289, 2273, 2274, 2274, 2271,
- 2272, 2273, 2274, 2274, 233, 5796, 2292, 2293, 2294, 1292, 3724, 2297, 2298, 2299, 2000, 151,
- 2302, 2303, 2200, 152, 2561, 2562, 2563, 2205, 2564, 2565, 2204, 2205, 2205, 363, 154, 154,
- 155, 2570, 59, 3725, 2001, 2574, 2575, 2576, 157, 2578, 2579, 2224, 2580, 2581, 2582, 2583,
- 2229, 2584, 2585, 2228, 2229, 2229, 654, 5798, 158, 2589, 2238, 2392, 2003, 2592, 2593, 2243,
- 2594, 2595, 2596, 2597, 2248, 2598, 2599, 2600, 2253, 2253, 2250, 145, 146, 2253, 2253, 2601,
- 2602, 2603, 2604, 2260, 2605, 2606, 2607, 6336, 2265, 6337, 6338, 6339, 2270, 2270, 6340, 6341,
- 2273, 2274, 2274, 2271, 2272, 2273, 2274, 2274, 6342, 6343, 2259, 2260, 2260,38288U,38289U, 147,
- 2265, 2265, 5795, 2268, 2269, 2270, 2270, 2271, 2272, 2273, 2274, 2274, 2271, 2272, 2273, 2274,
- 2274};
-Word16 mlt_sqvh_bitcount_category_4[256] = {
- 2, 4, 7,10, 4, 5, 7,10, 7, 8,10,14,11,11,15,15,
- 4, 5, 9,12, 5, 5, 8,12, 8, 7,10,15,11,11,15,15,
- 7, 9,12,15, 8, 8,12,15,10,10,13,15,14,14,15,13,
-11,13,15,15,11,13,15,15,14,15,15,13,15,15,13,13,
- 4, 5, 9,13, 5, 6, 9,13, 9, 9,11,15,14,13,15,15,
- 4, 6, 9,12, 5, 6, 9,13, 9, 8,11,15,13,12,15,15,
- 7, 9,12,15, 7, 8,11,15,10,10,14,15,14,15,15,14,
-10,12,15,15,11,13,15,15,15,15,15,14,15,15,14,14,
- 6, 9,13,14, 8, 9,12,15,12,12,15,15,15,15,15,15,
- 7, 9,13,15, 8, 9,12,15,11,12,15,15,15,15,15,15,
- 9,11,15,15, 9,11,15,15,14,14,15,15,15,15,15,15,
-14,15,15,15,14,15,15,15,15,15,15,15,14,14,15,15,
- 9,12,15,15,12,13,15,15,15,15,15,15,15,15,15,15,
-10,12,15,15,12,14,15,15,15,15,15,15,15,15,15,15,
-14,15,15,15,15,15,15,15,15,15,15,15,14,14,15,15,
-15,15,15,15,15,15,15,15,14,14,15,15,14,14,15,15};
-UWord16 mlt_sqvh_code_category_4[256] = {
- 1, 2, 4, 572, 10, 0, 69, 712, 91, 10, 46, 9182, 1426, 1430,30172,30194,
- 9, 28, 22, 2258, 16, 25, 142, 2179, 15, 111, 719, 1521, 1131, 1437, 1520,30196,
- 88, 283, 3803,30193, 13, 236, 2856,30166, 545, 951, 5709, 1522, 3241, 9180,30179, 5709,
- 1088, 4356,30410,30175, 1146, 377,30162,30163, 8715,30176,30165, 5709,30197,30184, 5709, 5709,
- 1, 23, 28, 5710, 26, 14, 29, 7538, 102, 103, 1429, 1524, 3237, 7060,30401,30201,
- 15, 13, 470, 3768, 24, 15, 281, 5747, 24, 181, 1128,30206, 5711, 3531,30156,30158,
- 116, 100, 2260,30187, 119, 234, 1764,30171, 716, 883, 9183,30164, 3236, 1528,30180, 9183,
- 885, 2870, 1532,30160, 1431, 5708,30192,30205,30402,30168,30173, 9183,30157,30161, 9183, 9183,
- 54, 25, 1621,15211, 180, 287, 2261,30198, 808, 811,30411,30413,30414,22986,22987,30411,
- 24, 273, 376,30159, 137, 280, 2871, 1523, 1768, 2259, 1525,30167, 1526,30169,30170, 1525,
- 443, 1434, 1527,30174, 474, 1769,30177,30178, 3238, 3239,30181,30181,30182,30183,30181,30181,
- 3240,30185,30186, 1527, 9181,30188,30189,30177,30190,30191,30181,30181, 3238, 3239,30181,30181,
- 440, 2857, 1529,30195, 2294, 7061, 1530,30199,30200, 1531,30202,30411,30203,30204,30411,30411,
- 203, 2872,30207,30400, 189,11492,30403,30404,30405,30406,30407, 1525,30408,30409, 1525, 1525,
- 8714, 1533,30412, 1527, 1534, 1535,30415,30177,30416,30417,30181,30181, 3238, 3239,30181,30181,
-30418,30419, 1527, 1527,30420,30421,30177,30177, 3238, 3239,30181,30181, 3238, 3239,30181,30181};
-Word16 mlt_sqvh_bitcount_category_5[243] = {
- 2, 4, 8, 4, 5, 9, 9,10,14, 4, 6,11, 5, 6,12,10,
-11,15, 9,11,15,10,13,15,14,15, 6, 4, 6,12, 6, 7,
-12,12,12,15, 5, 7,13, 6, 7,13,12,13,15,10,12,15,
-11,13,15,15,15, 7, 8,13,15,11,12,15,15,15, 7,10,
-13,15,12,15,15,15,15, 7,15,15, 7,15,15, 7, 6, 7,
- 7, 4, 5,11, 5, 7,12,11,12,15, 6, 7,13, 7, 8,14,
-12,14,15,11,13,15,12,13,15,15,15, 8, 5, 6,13, 7,
- 8,15,12,14,15, 6, 8,14, 7, 8,15,14,15,15,12,12,
-15,12,13,15,15,15, 8, 9,13,15,12,13,15,15,15, 8,
-11,13,15,13,13,15,15,15, 8,14,15, 8,15,15, 8, 7,
- 8, 8, 8,10,15,11,12,15,15,15, 7,10,12,15,12,13,
-15,15,15, 8,14,15, 7,15,15, 8, 7, 8, 8, 8,12,15,
-12,13,15,15,15, 8,11,13,15,13,15,15,15,15, 8,15,
-15, 8,15,15, 8, 7, 8, 8,14,15, 6,15,15, 8, 7, 8,
- 8,15,15, 8,15,15, 8, 7, 8, 8, 6, 8, 8, 7, 8, 8,
- 7, 8, 8};
-UWord16 mlt_sqvh_code_category_5[243] = {
- 0, 5, 220, 10, 16, 443, 390, 391,14333, 11, 26, 1566, 26, 54, 3135, 508,
- 1558,28581, 255, 1782,28599, 885, 6208,28578,14335,28579, 54, 9, 35, 3129, 27, 68,
- 3537, 1562, 3568,28610, 25, 62, 4078, 58, 118, 7763, 3107, 7758,28563, 778, 3131,28598,
- 780, 7123,28630,28593,28586, 118, 243, 6210,28614, 1018, 3567,28601,28611,28570, 68, 388,
- 6256,28619, 1559,28562,28606,28565,28591, 118,28594,28571, 62,28618,28590, 118, 58, 118,
- 118, 4, 28, 1781, 31, 60, 3134, 1938, 3882,28574, 25, 96, 7757, 49, 126,14244,
- 3883,14334,28613, 1769, 4077,28602, 3106, 7756,28582,28621,28566, 126, 14, 61, 4079, 61,
- 138,28491, 3536, 8153,28573, 49, 96,12442, 119, 240,28490,12443,28560,28561, 3111, 3580,
-28564, 3130, 7759,28567,28568,28569, 240, 444, 6209,28572, 3569, 6211,28575,28576,28577, 138,
- 778, 7760,28580, 7761, 7762,28583,28584,28585, 240,14319,28587, 96,28588,28589, 240, 119,
- 240, 240, 139, 968,28592, 1554, 3581,28595,28596,28597, 60, 971, 3560,28600, 3582, 7132,
-28603,28604,28605, 126,14332,28607, 96,28608,28609, 126, 49, 126, 126, 241, 1558,28612,
- 1563, 6257,28615,28616,28617, 138, 1559, 7133,28620, 6220,28622,28623,28624,28625, 240,28626,
-28627, 96,28628,28629, 240, 119, 240, 240, 8152,28631, 61,28632,28633, 138, 61, 138,
- 138,28634,28635, 96,28636,28637, 240, 119, 240, 240, 49, 96, 96, 119, 240, 240,
- 119, 240, 240};
-Word16 mlt_sqvh_bitcount_category_6[32] = {
- 1, 4, 4, 6, 4, 6, 6, 8, 4, 6, 6, 8, 6, 9, 8,10,
- 4, 6, 7, 8, 6, 9, 8,11, 6, 9, 8,10, 8,10, 9,11};
-UWord16 mlt_sqvh_code_category_6[32] = {
- 1, 2, 4, 2, 5, 29, 24, 101, 3, 31, 28, 105, 3, 5, 102, 424,
- 1, 30, 0, 107, 27, 200, 103, 806, 1, 4, 104, 402, 3, 425, 213, 807};
-
-Word16 *table_of_bitcount_tables[NUM_CATEGORIES-1] = {
-mlt_sqvh_bitcount_category_0,
-mlt_sqvh_bitcount_category_1,
-mlt_sqvh_bitcount_category_2,
-mlt_sqvh_bitcount_category_3,
-mlt_sqvh_bitcount_category_4,
-mlt_sqvh_bitcount_category_5,
-mlt_sqvh_bitcount_category_6
-};
-
-
-UWord16 *table_of_code_tables[NUM_CATEGORIES-1] = {
-(UWord16 *)mlt_sqvh_code_category_0,
-(UWord16 *)mlt_sqvh_code_category_1,
-(UWord16 *)mlt_sqvh_code_category_2,
-(UWord16 *)mlt_sqvh_code_category_3,
-(UWord16 *)mlt_sqvh_code_category_4,
-(UWord16 *)mlt_sqvh_code_category_5,
-(UWord16 *)mlt_sqvh_code_category_6
-};
-
-Word16 mlt_decoder_tree_category_0[180][2] = {
-{ 1, 0},{ 2, 3},{ 4, 5},{ 6, 7},{ 8, 9},{ -1, -14},{ 10, 11},{ 12, 13},
-{ 14, 15},{ 16, 17},{ 18, 19},{ -15, 20},{ 21, 22},{ 23, -28},{ 24, -2},{ 25, 26},
-{ 27, 28},{ 29, 30},{ 31, 32},{ -29, 33},{ -16, 34},{ -3, 35},{ 36, 37},{ -42, 38},
-{ 39, 40},{ 41, 42},{ 43, 44},{ -17, 45},{ -43, 46},{ 47, 48},{ -4, 49},{ -56, 50},
-{ 51, 52},{ 53, 54},{ 55, 56},{ -57, -5},{ -30, 57},{ 58, 59},{ -18, 60},{ 61, -70},
-{ 62, 63},{ 64, -6},{ 65, 66},{ -44, 67},{ -71, 68},{ 69, 70},{ -19, -31},{ -84, 71},
-{ 72, 73},{ 74, 75},{ 76, 77},{ -7, 78},{ 79, -20},{ 80, 81},{ -85, 82},{ -98, 83},
-{ -58, 84},{ 85, -32},{ -99, 86},{ -8, 87},{ 88, 89},{ -72, -45},{ 90, -33},{ 91,-112},
-{ -21, 92},{ -59,-113},{ -46, 93},{ -9, 94},{ -22, 95},{ 96, 97},{ 98, 99},{ -23, -86},
-{ 100, 101},{ -34, -73},{ 102,-126},{-127, -35},{ 103, -47},{ 104, 105},{ 106, 107},{-140,-100},
-{-114, -87},{ 108, 109},{ 110, 111},{-141, -60},{ 112, -48},{ 113, -24},{ -10, -61},{ 114,-101},
-{ 115, 116},{ -74, -36},{ 117,-128},{ 118, -62},{ 119, 120},{ -37, 121},{ -11, -49},{ -88, 122},
-{ 123,-115},{-154, -25},{-142, 124},{-155,-129},{ 125, -50},{ 126, 127},{ -76, -75},{ 128, 129},
-{ -63, -77},{-102, -39},{ -38, 130},{ -51, 131},{ -89,-116},{-117,-156},{ 132, -52},{ -78, 133},
-{ 134,-103},{ 135, 136},{-143, -65},{ 137, -64},{-130,-131},{ -90, 138},{-104, -91},{ -92, 139},
-{-169,-183},{ -26,-118},{ 140, 141},{-144, -66},{ -12, 142},{-168, 143},{-105,-157},{ 144,-182},
-{ 145, 146},{ -79, 147},{ -53,-170},{ 148, 149},{ -27,-145},{ 150, -80},{-106, -13},{-132, -67},
-{-158, -40},{-119, 151},{ 152,-107},{ 153, 154},{ -41,-184},{ 155, 156},{ -54, 157},{-171, 158},
-{ -94, 159},{-134,-146},{ -93,-133},{-159,-108},{ 160, -81},{ 161,-160},{ 162, -68},{-120,-122},
-{-172, 163},{ -55, -95},{ 164,-109},{-161, -82},{-173,-185},{ 165, -69},{-147,-186},{ 166, 167},
-{-121, -96},{ 168,-148},{-174, 169},{ 170,-136},{ -83, 171},{ 172, 173},{-135,-110},{-187, 174},
-{-149,-150},{ 175,-123},{-162,-163},{ -97,-175},{-188, 176},{ 177, 178},{ 179,-111},{-151,-124},
-{-137,-177},{-176,-125},{-164,-138},{-189,-190},};
-Word16 mlt_decoder_tree_category_1[93][2] = {
-{ 1, 0},{ 2, 3},{ 4, 5},{ 6, 7},{ 8, -10},{ -1, 9},{ 10, 11},{ 12, 13},
-{ -11, 14},{ 15, 16},{ 17, 18},{ -20, -2},{ 19, 20},{ -21, 21},{ 22, 23},{ -12, 24},
-{ 25, 26},{ 27, 28},{ 29, 30},{ -30, 31},{ -31, -3},{ 32, -22},{ 33, -13},{ 34, 35},
-{ 36, 37},{ 38, 39},{ 40, -4},{ -41, -14},{ 41, -40},{ -32, 42},{ 43, -23},{ 44, 45},
-{ 46, 47},{ 48, -5},{ -51, -50},{ -42, 49},{ -33, 50},{ -15, 51},{ 52, 53},{ 54, -24},
-{ 55, -43},{ 56, -52},{ 57, -61},{ -60, 58},{ -25, 59},{ -16, -34},{ -6, 60},{ -62, 61},
-{ -71, 62},{ -35, -7},{ 63, -72},{ -53, -17},{ 64, -44},{ -26, -70},{ 65, -45},{ -36, 66},
-{ -63, 67},{ -80, -54},{ -81, 68},{ -27, 69},{ 70, -82},{ -18, 71},{ 72, -55},{ 73, -64},
-{ 74, -73},{ 75, -46},{ -37, 76},{ -91, -8},{ -9, 77},{ -90, -83},{ 78, -28},{ 79, -56},
-{ -65, -38},{ -74, 80},{ -19, -57},{ -92, 81},{ -47, -48},{ 82, -66},{ 83, -29},{ -84, 84},
-{ -75, -85},{ -67, -93},{ -39, 85},{ -76, 86},{ -58, 87},{ 88, -49},{ -94, 89},{ 90, -68},
-{ 91, -78},{ -86, -59},{ -77, -95},{ 92, -69},{ -87, -96},};
-Word16 mlt_decoder_tree_category_2[47][2] = {
-{ 1, 0},{ 2, 3},{ 4, 5},{ 6, -7},{ -1, 7},{ -8, 8},{ 9, 10},{ 11, 12},
-{ 13, -14},{ -15, -9},{ -2, 14},{ 15, 16},{ 17, 18},{ 19, -16},{ 20, -22},{ -10, 21},
-{ -21, -3},{ 22, 23},{ 24, 25},{ -23, -17},{ 26, 27},{ 28, -29},{ -11, -28},{ 29, 30},
-{ -4, -24},{ -30, 31},{ 32, -18},{ 33, -35},{ -36, 34},{ -31, -12},{ 35, -25},{ -5, -37},
-{ 36, 37},{ -42, 38},{ -19, -43},{ -32, 39},{ -13, -38},{ -26, -20},{ 40, -6},{ -44, 41},
-{ 42, -39},{ -33, -45},{ 43, -27},{ 44, -46},{ 45, -34},{ -40, 46},{ -41, -47},};
-Word16 mlt_decoder_tree_category_3[519][2] = {
-{ 1, 2},{ 3, 4},{ 5, 0},{ 6, 7},{ 8, 9},{ 10, 11},{ 12, 13},{ 14, 15},
-{ 16, 17},{-125, 18},{ -1, 19},{ 20, 21},{ 22, 23},{ 24, 25},{ -5, -25},{ 26, 27},
-{ -6,-150},{ 28, 29},{ 30, 31},{ 32, 33},{ 34, -30},{ 35, 36},{ 37, 38},{ 39, -31},
-{-126,-155},{ 40, 41},{-156, 42},{ 43,-130},{ 44,-131},{-151, -26},{ 45, 46},{-250, 47},
-{ 48, 49},{ 50, 51},{ 52,-275},{ 53, 54},{ -2, -7},{ 55, 56},{ 57, 58},{ 59, 60},
-{ 61, 62},{ 63, 64},{ 65, 66},{ 67, 68},{ 69, 70},{ 71, -50},{ 72,-180},{ 73, 74},
-{ 75, 76},{ 77, -55},{ 78,-175},{ 79, -36},{ 80, 81},{ -35, -10},{ 82, 83},{-280, 84},
-{ -11, 85},{ 86, -32},{ 87, 88},{ 89,-161},{ 90,-276},{ 91, 92},{-281, 93},{ -8, 94},
-{ 95, 96},{ 97,-157},{-181,-400},{-132, 98},{-375, 99},{-160, 100},{-127, 101},{ -27, 102},
-{ 103,-251},{ -56, 104},{ 105,-256},{-300, -3},{-152,-255},{ 106, 107},{ -37, 108},{-305, 109},
-{-176, 110},{-136, 111},{ -12, 112},{ 113, 114},{ 115,-135},{ 116, 117},{-162, 118},{ -16, -51},
-{-186, 119},{ 120, 121},{ 122, 123},{ -41, 124},{ -61, 125},{ 126, 127},{ 128, 129},{ 130, -60},
-{ 131, 132},{-306, 133},{ 134,-205},{-405, 135},{ 136, 137},{ 138, 139},{-185, 140},{ 141,-500},
-{ -15, 142},{ 143, -80},{ -75, -40},{-301, 144},{ 145, 146},{-200, 147},{ 148, 149},{ 150, 151},
-{ 152,-525},{ 153,-177},{-425, 154},{ 155, -13},{-430, 156},{ 157,-406},{ 158, 159},{-206,-380},
-{ 160, 161},{ 162, 163},{ 164,-182},{-137, 165},{-286, 166},{ 167,-401},{ 168, 169},{ -42, -33},
-{ 170,-166},{ -57,-325},{ 171,-187},{ -38, 172},{ 173, 174},{-165,-330},{ -4,-282},{ 175,-257},
-{-261,-311},{-376, 176},{ 177, 178},{ -28, 179},{ 180, -9},{-285, 181},{ 182, 183},{ 184,-277},
-{ 185,-133},{-310, -81},{ -85, 186},{-158,-210},{ -17, 187},{ 188, 189},{ 190, -52},{-141, 191},
-{ 192,-128},{-191, -20},{ 193,-140},{ 194, 195},{-211,-260},{ 196, 197},{ 198, 199},{ 200, -66},
-{-201,-225},{-381, 201},{ 202, 203},{ 204, 205},{ 206, 207},{-163,-287},{ 208,-100},{ 209, 210},
-{ 211, 212},{ 213,-252},{-105, -76},{ 214, 215},{ 216, -21},{ -86, -62},{-307, 217},{ -65,-455},
-{-550, 218},{ 219, 220},{ 221, 222},{ 223, 224},{ 225,-230},{-142, 226},{-302,-426},{-431, 227},
-{ 228, 229},{ 230,-190},{-402, -46},{-153,-450},{-505, 231},{ 232, 233},{ 234, 235},{ 236, 237},
-{ 238, 239},{-262, -29},{ 240, 241},{ 242, 243},{-167, -67},{-331,-530},{ 244, 245},{ 246, 247},
-{ 248, 249},{ 250, 251},{ 252, 253},{ 254, 255},{ 256, 257},{ 258, 259},{ 260, 261},{ 262,-336},
-{ 263,-171},{-192,-207},{-258,-138},{ 264, 265},{ 266, 267},{ 268, 269},{ 270, 271},{ 272, 273},
-{ 274, -45},{-335,-411},{ -43, -18},{-265, -71},{-316,-326},{-350,-407},{-146, -14},{ 275, 276},
-{ 277, 278},{ 279, 280},{ 281,-216},{ -34,-283},{-291,-312},{-410,-168},{-555, 282},{ -70, -53},
-{-235, -87},{ -77,-183},{-315,-332},{-178, -58},{ 283, 284},{ 285, 286},{ 287, 288},{ 289, 290},
-{ 291, 292},{ 293, 294},{ 295, 296},{ 297, 298},{-202,-226},{-170,-267},{-134,-290},{-355,-385},
-{-386, -47},{-526,-196},{ 299, 300},{ 301, 302},{ 303, 304},{ 305, 306},{ 307, 308},{ 309, 310},
-{ 311, 312},{ 313, 314},{ 315, 316},{ 317, 318},{ 319, 320},{ 321, 322},{ 323, 324},{ 325,-111},
-{-231,-253},{ -91, -82},{-172,-145},{ -22,-317},{ -90,-356},{-382,-159},{ 326, 327},{ 328, 329},
-{ 330, 331},{ 332, 333},{ 334, 335},{-106,-263},{-278,-215},{-110, -39},{-101,-377},{-129, -63},
-{-436,-195},{-506,-531},{ 336,-212},{-154,-266},{ -59,-288},{-292,-303},{-337,-432},{-188,-451},
-{-456,-460},{-501,-236},{-551, 337},{ 338, 339},{ 340, 341},{ 342, 343},{ 344, 345},{ 346, 347},
-{ 348, 349},{ 350, 351},{ 352, 353},{ 354, 355},{ 356, 357},{ 358, 359},{ 360, 361},{ 362, 363},
-{ 364, 365},{ 366, 367},{ 368, 369},{ 370, 371},{ 372, 373},{ 374, 375},{ 376, 377},{ 378, 379},
-{ 380, 381},{ 382, 383},{ 384, 385},{ 386, 387},{ 388, 389},{ 390, 391},{ 392, 393},{ 394, 395},
-{ 396, 397},{ 398, 399},{ 400, 401},{ 402, 403},{ 404, 405},{ 406, 407},{ -72,-272},{-309,-333},
-{-340,-360},{ -68,-387},{-184,-416},{-427,-147},{-435,-437},{-115,-480},{-510,-532},{-164,-556},
-{ 408,-295},{-296,-297},{-107,-313},{-193,-173},{-320,-327},{-341,-351},{-352,-143},{-378, -19},
-{-403,-412},{-268, -54},{ -83,-441},{-442,-457},{-475, -44},{ -97,-511},{-515,-208},{-527,-528},
-{-237,-536},{-552, 409},{ 410, 411},{ 412, 413},{ 414, 415},{ 416, 417},{ 418, 419},{ 420, 421},
-{ 422, 423},{ 424, 425},{ 426, 427},{ 428, 429},{ 430, 431},{ 432, 433},{ 434, 435},{ 436, 437},
-{ 438, 439},{ 440, 441},{ 442, 443},{ 444, 445},{ 446, 447},{ 448, 449},{ 450, 451},{ 452, 453},
-{ 454, 455},{ 456, 457},{ 458, 459},{ 460, 461},{ 462, 463},{ 464, 465},{ 466, 467},{ 468, 469},
-{ 470, 471},{ 472, 473},{ 474, 475},{ 476, 477},{ 478, 479},{ 480, 481},{ 482, 483},{ 484, 485},
-{ 486, 487},{ 488, 489},{ 490, 491},{ 492, 493},{ 494, 495},{ 496, 497},{ 498, 499},{ 500, 501},
-{ 502, 503},{ 504, 505},{ 506, 507},{ 508, 509},{ 510, 511},{ 512, 513},{ 514, 515},{ 516, 517},
-{ 518,-104},{ -84,-218},{-318,-319},{-117,-321},{-322,-323},{-219,-174},{-243,-328},{-329, -94},
-{-228,-194},{-240,-334},{-102,-229},{-169,-338},{-339,-116},{-289,-342},{-343,-345},{-346,-347},
-{ -23,-203},{-214,-353},{-204,-220},{-357,-358},{-264,-361},{-362,-363},{-365,-366},{-367, -92},
-{-245,-121},{-293,-379},{-108,-232},{-221,-383},{-384,-233},{-294,-241},{-388,-389},{-390,-391},
-{-392,-393},{-394,-395},{-396,-397},{-398, -24},{-109,-149},{-242,-404},{ -64, -79},{ -89,-408},
-{-409,-213},{-120,-113},{-413,-414},{-415, -96},{-417,-418},{-419,-420},{-421,-422},{-423,-298},
-{ -69,-269},{-428,-429},{ -78,-270},{ -88,-433},{-434,-271},{-234,-259},{-438,-439},{-440,-227},
-{-179,-443},{-445,-446},{-447,-223},{-238,-452},{-453,-454},{-273,-254},{-246,-458},{-459, -48},
-{-461,-462},{-463,-465},{-466,-467},{-468,-470},{-471,-304},{-476,-477},{-478,-112},{-481,-482},
-{-483,-485},{-486,-487},{-490,-491},{-103,-118},{-502,-503},{-504,-189},{ -93,-507},{-508,-509},
-{-148,-139},{-512,-513},{-308,-516},{-517,-518},{-520,-521},{ -73, -98},{ -95, -49},{-529,-222},
-{-217,-197},{-533,-534},{-535,-284},{-537,-538},{-540,-541},{-542,-543},{-545,-546},{-144,-198},
-{-314,-553},{-209,-279},{-557,-558},{-560,-561},{-562,-563},{-565,-566},{-567,-575},{-576,-577},
-{-578,-580},{-581,-582},{-583,-585},{-586,-587},{-590,-591},{-600,-601},{-605,-606},};
-Word16 mlt_decoder_tree_category_4[208][2] = {
-{ 1, 2},{ 3, 0},{ 4, 5},{ 6, 7},{ 8, 9},{ 10, 11},{ 12, -64},{ -1, 13},
-{ 14, -16},{ -4, 15},{ 16, 17},{ 18, -80},{ -5, 19},{ 20, 21},{ -20, 22},{ 23, -65},
-{ -84, -21},{ -68, 24},{ -17, 25},{ 26, 27},{ 28, -81},{ -69, -85},{ 29, 30},{ 31, 32},
-{-128, 33},{ 34, 35},{ -2, 36},{ 37, 38},{-144, 39},{ 40, -6},{ 41, 42},{ -32, 43},
-{ 44, -8},{ 45, -25},{ -96, 46},{ 47,-100},{ -9, 48},{ 49, -36},{ 50, -24},{ 51, 52},
-{ 53,-148},{ 54, 55},{ -22, 56},{ 57, 58},{-132, -89},{ 59, 60},{-101, 61},{ -37, 62},
-{ -18, 63},{ -88,-129},{ -66, -70},{ -97, 64},{ -72, -73},{ 65,-145},{-149, -86},{ 66, -33},
-{ 67,-133},{ 68, 69},{ 70, 71},{-192, 72},{ 73,-160},{ -82, 74},{-164, 75},{ -10, 76},
-{ 77,-208},{ 78, -40},{ 79, 80},{ -3, 81},{ -7, 82},{ 83, 84},{-104, 85},{ 86, -26},
-{ 87,-105},{ 88,-112},{ 89, 90},{ 91, -41},{ 92, 93},{ 94, 95},{ -48, 96},{ -90, 97},
-{ 98, -28},{ -52, 99},{ -12, 100},{ 101, -74},{ -13,-116},{-161, 102},{ 103, -29},{-102, 104},
-{-152,-165},{ 105, 106},{ 107, 108},{ 109, 110},{ 111,-212},{ 112, 113},{-136, 114},{ 115,-137},
-{ 116, -23},{ -19,-153},{ -98,-134},{-196, 117},{ 118, 119},{ -38,-193},{-113,-150},{-209, 120},
-{ 121, -93},{ -83, 122},{ 123, 124},{ 125, 126},{ 127, 128},{ 129, 130},{ 131, -34},{-146, -53},
-{ 132, 133},{ 134, 135},{ 136, 137},{ 138,-130},{ -49, 139},{ 140, 141},{-117, -42},{ -67, -92},
-{ 142, -87},{ -77,-197},{ -71, 143},{ 144, 145},{ 146, 147},{ 148, 149},{ 150, 151},{ 152, 153},
-{ 154, 155},{ 156, 157},{ 158, 159},{ 160, 161},{ 162, 163},{ 164, 165},{ 166, 167},{ 168, 169},
-{-108, -76},{-168,-169},{-176, -44},{-224, -56},{ -45,-180},{ -11,-106},{-213, 170},{ 171, 172},
-{ 173, 174},{ 175, 176},{ 177, 178},{ 179, 180},{ 181, 182},{ 183, 184},{ 185, 186},{ 187, 188},
-{ 189, 190},{ 191, 192},{ 193, 194},{ 195, 196},{ 197, 198},{ 199, 200},{ 201, 202},{ 203, 204},
-{ 205, 206},{ 207,-131},{ -30, -27},{ -43,-151},{ -75,-154},{-156,-162},{-109,-194},{-198,-201},
-{-114,-225},{-228,-229},{-141,-142},{ -94,-124},{ -95,-147},{-115,-125},{ -54, -55},{-107, -58},
-{ -39,-155},{-121,-157},{-158,-103},{ -14,-122},{-163, -51},{ -57,-166},{-167, -46},{-110,-170},
-{-172,-173},{ -61,-177},{-178, -99},{-181,-182},{-184,-185},{-118, -35},{ -15,-195},{ -31, -60},
-{-135,-199},{-200, -79},{-202,-204},{-205,-119},{ -91,-210},{-211, -78},{-120,-214},{-215,-216},
-{-217,-218},{-220,-221},{ -50,-138},{-226,-139},{-140,-230},{-232,-233},{-240,-241},{-244,-245},
-};
-Word16 mlt_decoder_tree_category_5[191][2] = {
-{ 1, 2},{ 0, 3},{ 4, 5},{ 6, 7},{ 8, 9},{ 10, 11},{ -81, -1},{ 12, 13},
-{ 14, -27},{ -3, -9},{ 15, 16},{ 17, 18},{ 19, 20},{-108, 21},{ -4, 22},{ 23, -36},
-{ -12, 24},{ -82, 25},{ 26, -84},{ 27, -90},{ -10, -30},{ 28, 29},{ 30, -28},{ 31,-117},
-{ -13, 32},{ -39, 33},{ 34,-109},{ 35, -93},{ -85,-111},{ -37, 36},{ -31, 37},{ -91, 38},
-{ 39, 40},{ -40,-120},{ 41, 42},{-118, 43},{ -94, 44},{-112,-162},{ 45, 46},{ -2, 47},
-{ 48, 49},{-121,-189},{ 50, -54},{ 51, 52},{ 53, -18},{ 54, 55},{ -6, 56},{ 57, -5},
-{-135, 58},{ 59, 60},{ 61, 62},{ -63, 63},{ 64, -7},{ -15, 65},{ 66, 67},{ -45, 68},
-{ 69, 70},{ 71, -21},{ 72, 73},{ 74, 75},{ 76, 77},{-163, 78},{ 79,-171},{-144, 80},
-{ -48, 81},{ -57, 82},{ 83, 84},{-165, 85},{ -16,-198},{ 86, 87},{ -11, 88},{ 89, -99},
-{ 90, -83},{ -19, 91},{ 92, 93},{ 94, 95},{ 96, 97},{ 98, 99},{ -87, 100},{ 101, 102},
-{-190, -66},{ -33,-192},{ 103, 104},{ 105, 106},{-102, -42},{ 107,-126},{ 108, -29},{-129, -46},
-{ -86, -14},{-114, -32},{-172, 109},{ 110, -58},{ -34,-138},{ 111, 112},{ 113, 114},{ 115, 116},
-{ 117, 118},{ 119, 120},{-127,-166},{-174, 121},{ 122, 123},{ 124, 125},{ -88, -96},{ 126,-100},
-{ -38,-110},{ -22,-136},{ -55,-139},{-201, 127},{ -64,-193},{ 128, -49},{-175,-199},{ 129, 130},
-{ 131, 132},{ 133, 134},{ 135, 136},{ 137, 138},{ 139, 140},{ 141, 142},{ 143, 144},{ 145, 146},
-{ 147, 148},{ 149, 150},{-103, -92},{ -43,-130},{-145,-147},{-148, -41},{-216,-115},{-119,-123},
-{ -95, 151},{ 152, 153},{ 154, 155},{ 156, 157},{ 158, 159},{ 160, 161},{ 162, 163},{ 164, 165},
-{ 166, 167},{ 168, 169},{ 170, 171},{ 172, 173},{ 174, 175},{ 176, 177},{ 178, 179},{ 180, 181},
-{ 182, 183},{ 184, 185},{ 186, 187},{ 188, 189},{ 190,-153},{-180, -8},{ -97, -24},{-122,-113},
-{-124,-125},{ -67, -44},{-128, -69},{-106,-131},{-132,-133},{ -61, -73},{-137,-116},{ -89,-140},
-{-141,-142},{ -23, -25},{-146, -17},{-104,-149},{-150,-151},{ -52,-154},{-156,-157},{ -76, -70},
-{-164, -51},{ -72,-167},{-168,-169},{ -47, -20},{-173, -59},{-101,-176},{-177,-178},{ -68,-181},
-{-183,-184},{ -35, -60},{-191, -98},{ -56,-194},{-195,-196},{ -75, -65},{-200,-105},{-202,-203},
-{-204,-205},{-207,-208},{-210,-211},{ -50,-217},{-219,-220},{-225,-226},{-228,-229},};
-Word16 mlt_decoder_tree_category_6[31][2] = {
-{ 1, 0},{ 2, 3},{ 4, 5},{ 6, 7},{ 8, -16},{ -1, -8},{ -2, -4},{ 9, 10},
-{ 11, 12},{ 13, 14},{ 15, 16},{ 17, -24},{ -3, -12},{ -6, 18},{ 19, -20},{ -10, -5},
-{ -17, -9},{ -18, 20},{ 21, 22},{ 23, 24},{ 25, -28},{ 26, -7},{ -14, -22},{ -26, -11},
-{ 27, -19},{ -25, -13},{ -21, 28},{ 29, -30},{ -27, 30},{ -15, -29},{ -23, -31},};
-
-Word16 *table_of_decoder_tables[NUM_CATEGORIES-1] = {
-(Word16 *)mlt_decoder_tree_category_0,
-(Word16 *)mlt_decoder_tree_category_1,
-(Word16 *)mlt_decoder_tree_category_2,
-(Word16 *)mlt_decoder_tree_category_3,
-(Word16 *)mlt_decoder_tree_category_4,
-(Word16 *)mlt_decoder_tree_category_5,
-(Word16 *)mlt_decoder_tree_category_6,
-};
-
diff --git a/sflphone-common/libs/pjproject/third_party/g7221/common/huff_tab.h b/sflphone-common/libs/pjproject/third_party/g7221/common/huff_tab.h
deleted file mode 100644
index 5ccd65008faf7106c56d3a23e64c0a4553c9c01f..0000000000000000000000000000000000000000
--- a/sflphone-common/libs/pjproject/third_party/g7221/common/huff_tab.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/***********************************************************************
-**
-** ITU-T G.722.1 (2005-05) - Fixed point implementation for main body and Annex C
-** > Software Release 2.1 (2008-06)
-** (Simple repackaging; no change from 2005-05 Release 2.0 code)
-**
-** � 2004 Polycom, Inc.
-**
-** All rights reserved.
-**
-***********************************************************************/
-
-extern Word16 differential_region_power_bits[MAX_NUMBER_OF_REGIONS][DIFF_REGION_POWER_LEVELS];
-extern UWord16 differential_region_power_codes[MAX_NUMBER_OF_REGIONS][DIFF_REGION_POWER_LEVELS];
-extern Word16 differential_region_power_decoder_tree[MAX_NUMBER_OF_REGIONS][DIFF_REGION_POWER_LEVELS-1][2];
-extern Word16 mlt_quant_centroid[NUM_CATEGORIES][MAX_NUM_BINS];
-extern Word16 expected_bits_table[NUM_CATEGORIES];
-extern Word16 mlt_sqvh_bitcount_category_0[196];
-extern UWord16 mlt_sqvh_code_category_0[196];
-extern Word16 mlt_sqvh_bitcount_category_1[100];
-extern UWord16 mlt_sqvh_code_category_1[100];
-extern Word16 mlt_sqvh_bitcount_category_2[49];
-extern UWord16 mlt_sqvh_code_category_2[49];
-extern Word16 mlt_sqvh_bitcount_category_3[625];
-extern UWord16 mlt_sqvh_code_category_3[625];
-extern Word16 mlt_sqvh_bitcount_category_4[256];
-extern UWord16 mlt_sqvh_code_category_4[256];
-extern Word16 mlt_sqvh_bitcount_category_5[243];
-extern UWord16 mlt_sqvh_code_category_5[243];
-extern Word16 mlt_sqvh_bitcount_category_6[32];
-extern UWord16 mlt_sqvh_code_category_6[32];
-extern Word16 *table_of_bitcount_tables[NUM_CATEGORIES-1];
-extern UWord16 *table_of_code_tables[NUM_CATEGORIES-1];
-extern Word16 mlt_decoder_tree_category_0[180][2];
-extern Word16 mlt_decoder_tree_category_1[93][2];
-extern Word16 mlt_decoder_tree_category_2[47][2];
-extern Word16 mlt_decoder_tree_category_3[519][2];
-extern Word16 mlt_decoder_tree_category_4[208][2];
-extern Word16 mlt_decoder_tree_category_5[191][2];
-extern Word16 mlt_decoder_tree_category_6[31][2];
-extern Word16 *table_of_decoder_tables[NUM_CATEGORIES-1];
-
diff --git a/sflphone-common/libs/pjproject/third_party/g7221/common/tables.c b/sflphone-common/libs/pjproject/third_party/g7221/common/tables.c
deleted file mode 100644
index 1018e6475fb54b4f7977f6d2d80614794954757c..0000000000000000000000000000000000000000
--- a/sflphone-common/libs/pjproject/third_party/g7221/common/tables.c
+++ /dev/null
@@ -1,298 +0,0 @@
-/****************************************************************************
-**
-** ITU-T G.722.1 (2005-05) - Fixed point implementation for main body and Annex C
-** > Software Release 2.1 (2008-06)
-** (Simple repackaging; no change from 2005-05 Release 2.0 code)
-**
-** � 2004 Polycom, Inc.
-**
-** All rights reserved.
-**
-****************************************************************************/
-
-/****************************************************************************
- Filename: tables.c
-
- Purpose: Contains tables used by G.722.1 Annex C
-
- Design Notes:
-
-****************************************************************************/
-
-/***************************************************************************
- Include files
-***************************************************************************/
-#include "defs.h"
-
-Word16 int_region_standard_deviation_table[REGION_POWER_TABLE_SIZE] = {
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 1, 1, 1, 1, 2, 3, 4, 6,
- 8, 11, 16, 23, 32, 45, 64, 91, 128, 181,
- 256, 362, 512, 724, 1024, 1448, 2048, 2896, 4096, 5793,
- 8192, 11585, 16384, 23170, 0,0,0,0,0,0,
- 0,0,0,0};
-
-Word16 standard_deviation_inverse_table[REGION_POWER_TABLE_SIZE] = {
- 32767, 32767, 32767, 32767, 32767, 32767, 32767, 32767, 32767, 32767,
- 32767, 32767, 32767, 32767, 32767, 32767, 32767, 32767, 32767, 32767,
- 32767, 32767, 32767, 32767, 32767, 23170, 16384, 11585, 8192, 5793,
- 4096, 2896, 2048, 1448, 1024, 724, 512, 362, 256, 181,
- 128, 91, 64, 45, 32, 23, 16, 11, 8, 6,
- 4, 3, 2, 1, 1, 1, 1, 0, 0, 0,
- 0, 0, 0, 0};
-
-
-Word16 step_size_inverse_table[NUM_CATEGORIES]={
- 23167,16384,11585,8192,5793,4096,2896,2896
-};
-
-
-Word16 vector_dimension[NUM_CATEGORIES] = { 2, 2, 2, 4, 4, 5, 5, 1};
-Word16 number_of_vectors[NUM_CATEGORIES] = {10,10,10, 5, 5, 4, 4,20};
-/* The last category isn't really coded with scalar quantization. */
-
-Word16 max_bin[NUM_CATEGORIES] = {13, 9, 6, 4, 3, 2, 1, 1};
-
-Word16 max_bin_plus_one_inverse[NUM_CATEGORIES] =
-{
- 2341,3277,4682,6554,8193,10923,16385,16385
-};
-
-/*
- * Release 1.2.
- * Add new version of int_dead_zone[] to go with
- * changes to vector_huffman() in encoder.c.
- *
- */
-
-/************** See new version of table below
-Word16 int_dead_zone[NUM_CATEGORIES]=
-{
- 9830,10813,11796,12780,13763,14746,16384,16384
-};
-***************/
-
-/******** New version of table added in Release 1.2 ********/
-Word16 int_dead_zone[NUM_CATEGORIES]=
-{
-2457, 2703, 2949, 3195, 3440, 3686, 4096, 4096
-};
-
-
-/*
- * Release 1.2.
- * Added this new table to go with
- * changes to vector_huffman() in encoder.c,
- * accompanies the new table for int_dead_zone[].
- */
-
-Word16 int_dead_zone_low_bits[NUM_CATEGORIES]=
-{
-2, 1, 0, 0, 3, 2, 0, 0
-};
-
-
-Word16 samples_to_rmlt_window[DCT_LENGTH]=
-{ 44, 134, 224, 314, 404, 494, 584, 674, 764, 853,
- 943, 1033, 1123, 1213, 1302, 1392, 1482, 1571, 1661, 1750,
- 1840, 1929, 2019, 2108, 2197, 2286, 2376, 2465, 2554, 2643,
- 2732, 2821, 2909, 2998, 3087, 3175, 3264, 3352, 3441, 3529,
- 3617, 3705, 3793, 3881, 3969, 4057, 4144, 4232, 4319, 4407,
- 4494, 4581, 4668, 4755, 4842, 4928, 5015, 5101, 5188, 5274,
- 5360, 5446, 5532, 5617, 5703, 5788, 5873, 5959, 6043, 6128,
- 6213, 6297, 6382, 6466, 6550, 6634, 6718, 6801, 6885, 6968,
- 7051, 7134, 7217, 7299, 7382, 7464, 7546, 7628, 7709, 7791,
- 7872, 7953, 8034, 8115, 8195, 8276, 8356, 8436, 8515, 8595,
- 8674, 8753, 8832, 8911, 8989, 9068, 9146, 9223, 9301, 9378,
- 9455, 9532, 9609, 9685, 9762, 9838, 9913, 9989, 10064, 10139,
- 10214, 10288, 10363, 10437, 10510, 10584, 10657, 10730, 10803, 10875,
- 10948, 11020, 11091, 11163, 11234, 11305, 11375, 11446, 11516, 11586,
- 11655, 11724, 11793, 11862, 11930, 11998, 12066, 12134, 12201, 12268,
- 12334, 12401, 12467, 12532, 12598, 12663, 12728, 12792, 12857, 12920,
- 12984, 13047, 13110, 13173, 13235, 13297, 13359, 13420, 13481, 13542,
- 13602, 13662, 13722, 13782, 13841, 13899, 13958, 14016, 14074, 14131,
- 14188, 14245, 14301, 14357, 14413, 14468, 14523, 14578, 14632, 14686,
- 14739, 14793, 14845, 14898, 14950, 15002, 15053, 15104, 15155, 15205,
- 15255, 15305, 15354, 15403, 15451, 15500, 15547, 15595, 15642, 15688,
- 15734, 15780, 15826, 15871, 15916, 15960, 16004, 16047, 16091, 16133,
- 16176, 16218, 16259, 16300, 16341, 16382, 16422, 16461, 16501, 16540,
- 16578, 16616, 16654, 16691, 16728, 16764, 16800, 16836, 16871, 16906,
- 16940, 16974, 17008, 17041, 17074, 17106, 17138, 17170, 17201, 17232,
- 17262, 17292, 17321, 17350, 17379, 17407, 17435, 17462, 17489, 17516,
- 17542, 17567, 17593, 17617, 17642, 17666, 17689, 17713, 17735, 17758,
- 17779, 17801, 17822, 17842, 17863, 17882, 17901, 17920, 17939, 17957,
- 17974, 17991, 18008, 18024, 18040, 18055, 18070, 18085, 18099, 18113,
- 18126, 18139, 18151, 18163, 18174, 18185, 18196, 18206, 18216, 18225,
- 18234, 18242, 18250, 18257, 18265, 18271, 18277, 18283, 18288, 18293,
- 18298, 18302, 18305, 18308, 18311, 18313, 18315, 18316, 18317, 18317,
-};
-
-Word16 rmlt_to_samples_window[DCT_LENGTH]=
-{ 44, 133, 222, 310, 399, 488, 577, 666, 754, 843,
- 932, 1020, 1109, 1198, 1286, 1375, 1464, 1552, 1641, 1729,
- 1817, 1906, 1994, 2082, 2171, 2259, 2347, 2435, 2523, 2611,
- 2699, 2786, 2874, 2962, 3049, 3137, 3224, 3312, 3399, 3486,
- 3573, 3660, 3747, 3834, 3921, 4008, 4094, 4181, 4267, 4353,
- 4439, 4526, 4611, 4697, 4783, 4869, 4954, 5040, 5125, 5210,
- 5295, 5380, 5465, 5549, 5634, 5718, 5802, 5886, 5970, 6054,
- 6138, 6221, 6304, 6388, 6471, 6553, 6636, 6719, 6801, 6883,
- 6965, 7047, 7129, 7211, 7292, 7373, 7454, 7535, 7616, 7696,
- 7777, 7857, 7937, 8016, 8096, 8175, 8254, 8333, 8412, 8491,
- 8569, 8647, 8725, 8803, 8880, 8957, 9035, 9111, 9188, 9264,
- 9341, 9417, 9492, 9568, 9643, 9718, 9793, 9868, 9942, 10016,
- 10090, 10163, 10237, 10310, 10383, 10455, 10528, 10600, 10672, 10743,
- 10815, 10886, 10957, 11027, 11098, 11168, 11237, 11307, 11376, 11445,
- 11514, 11582, 11650, 11718, 11785, 11853, 11920, 11986, 12053, 12119,
- 12185, 12250, 12315, 12380, 12445, 12509, 12573, 12637, 12701, 12764,
- 12826, 12889, 12951, 13013, 13075, 13136, 13197, 13257, 13318, 13378,
- 13437, 13497, 13556, 13614, 13673, 13731, 13788, 13846, 13903, 13959,
- 14016, 14072, 14128, 14183, 14238, 14292, 14347, 14401, 14454, 14508,
- 14561, 14613, 14665, 14717, 14769, 14820, 14871, 14921, 14971, 15021,
- 15070, 15119, 15168, 15216, 15264, 15311, 15359, 15405, 15452, 15498,
- 15544, 15589, 15634, 15678, 15722, 15766, 15810, 15853, 15895, 15938,
- 15979, 16021, 16062, 16103, 16143, 16183, 16223, 16262, 16300, 16339,
- 16377, 16414, 16452, 16488, 16525, 16561, 16596, 16632, 16666, 16701,
- 16735, 16768, 16801, 16834, 16867, 16899, 16930, 16961, 16992, 17022,
- 17052, 17082, 17111, 17140, 17168, 17196, 17223, 17250, 17277, 17303,
- 17329, 17354, 17379, 17404, 17428, 17452, 17475, 17498, 17520, 17542,
- 17564, 17585, 17606, 17626, 17646, 17665, 17684, 17703, 17721, 17739,
- 17756, 17773, 17790, 17806, 17821, 17836, 17851, 17865, 17879, 17893,
- 17906, 17918, 17931, 17942, 17954, 17965, 17975, 17985, 17995, 18004,
- 18012, 18021, 18028, 18036, 18043, 18049, 18055, 18061, 18066, 18071,
- 18076, 18079, 18083, 18086, 18089, 18091, 18093, 18094, 18095, 18095,
-};
-
-Word16 max_samples_to_rmlt_window[MAX_DCT_LENGTH]={
-0, 43, 89, 133, 178, 222, 268, 314, 357, 403,
-447, 493, 538, 582, 628, 671, 717, 763, 807, 853,
-896, 942, 987, 1031, 1077, 1121, 1166, 1212, 1256, 1301,
-1345, 1390, 1436, 1480, 1526, 1569, 1615, 1660, 1704, 1749,
-1793, 1838, 1884, 1928, 1973, 2016, 2062, 2107, 2151, 2196,
-2239, 2285, 2331, 2374, 2419, 2463, 2508, 2553, 2597, 2642,
-2685, 2730, 2776, 2819, 2864, 2908, 2952, 2998, 3041, 3086,
-3129, 3174, 3219, 3263, 3307, 3350, 3396, 3440, 3483, 3528,
-3571, 3616, 3661, 3704, 3748, 3791, 3836, 3881, 3923, 3968,
-4011, 4055, 4100, 4143, 4187, 4230, 4274, 4318, 4362, 4406,
-4448, 4493, 4537, 4580, 4624, 4666, 4710, 4755, 4797, 4841,
-4883, 4927, 4971, 5013, 5057, 5099, 5144, 5187, 5229, 5273,
-5315, 5359, 5402, 5444, 5488, 5530, 5573, 5617, 5658, 5702,
-5743, 5787, 5830, 5871, 5915, 5956, 6000, 6043, 6084, 6127,
-6169, 6211, 6254, 6296, 6339, 6380, 6423, 6465, 6507, 6549,
-6590, 6633, 6675, 6716, 6759, 6799, 6842, 6884, 6925, 6967,
-7007, 7050, 7092, 7132, 7175, 7215, 7257, 7299, 7339, 7381,
-7421, 7462, 7504, 7544, 7586, 7626, 7667, 7709, 7749, 7790,
-7830, 7871, 7912, 7952, 7993, 8032, 8073, 8114, 8153, 8194,
-8234, 8275, 8315, 8355, 8395, 8434, 8474, 8515, 8554, 8594,
-8632, 8673, 8713, 8752, 8792, 8830, 8871, 8910, 8949, 8989,
-9027, 9066, 9106, 9144, 9184, 9221, 9261, 9300, 9338, 9378,
-9415, 9454, 9493, 9531, 9570, 9607, 9646, 9685, 9722, 9761,
-9798, 9836, 9875, 9912, 9950, 9987, 10025, 10064, 10100, 10138,
-10175, 10213, 10250, 10287, 10325, 10361, 10398, 10436, 10472, 10510,
-10545, 10583, 10620, 10656, 10692, 10728, 10766, 10803, 10838, 10874,
-10910, 10947, 10983, 11018, 11055, 11089, 11126, 11162, 11197, 11233,
-11268, 11303, 11340, 11374, 11410, 11444, 11480, 11515, 11549, 11585,
-11619, 11654, 11689, 11723, 11758, 11791, 11826, 11861, 11895, 11930,
-11963, 11997, 12032, 12065, 12099, 12132, 12166, 12201, 12233, 12267,
-12300, 12333, 12367, 12400, 12433, 12465, 12499, 12532, 12563, 12597,
-12629, 12662, 12695, 12727, 12759, 12790, 12823, 12856, 12887, 12920,
-12951, 12983, 13016, 13046, 13078, 13109, 13141, 13173, 13203, 13235,
-13266, 13296, 13328, 13358, 13389, 13419, 13450, 13481, 13510, 13541,
-13571, 13602, 13632, 13661, 13692, 13721, 13751, 13781, 13810, 13840,
-13869, 13898, 13929, 13957, 13986, 14015, 14044, 14073, 14101, 14130,
-14158, 14187, 14216, 14244, 14272, 14300, 14328, 14357, 14384, 14412,
-14439, 14468, 14495, 14522, 14550, 14577, 14604, 14632, 14658, 14686,
-14711, 14739, 14765, 14792, 14819, 14844, 14871, 14897, 14923, 14949,
-14975, 15001, 15027, 15053, 15079, 15103, 15129, 15155, 15180, 15205,
-15229, 15255, 15280, 15304, 15329, 15353, 15378, 15403, 15426, 15451,
-15475, 15499, 15523, 15546, 15570, 15594, 15618, 15641, 15664, 15688,
-15711, 15734, 15757, 15780, 15802, 15825, 15848, 15871, 15892, 15915,
-15937, 15960, 15982, 16003, 16026, 16047, 16069, 16090, 16112, 16133,
-16154, 16175, 16197, 16217, 16239, 16259, 16279, 16301, 16320, 16341,
-16361, 16382, 16402, 16421, 16441, 16461, 16481, 16501, 16520, 16539,
-16558, 16578, 16597, 16615, 16635, 16653, 16672, 16691, 16709, 16728,
-16746, 16764, 16782, 16800, 16818, 16835, 16853, 16871, 16888, 16905,
-16923, 16940, 16957, 16974, 16991, 17008, 17024, 17041, 17057, 17074,
-17090, 17106, 17122, 17138, 17154, 17169, 17185, 17201, 17216, 17231,
-17246, 17262, 17277, 17291, 17306, 17321, 17336, 17350, 17364, 17379,
-17393, 17407, 17421, 17435, 17449, 17462, 17476, 17490, 17502, 17515,
-17528, 17542, 17554, 17567, 17580, 17592, 17605, 17618, 17629, 17642,
-17653, 17666, 17678, 17689, 17701, 17712, 17724, 17736, 17746, 17757,
-17768, 17779, 17790, 17800, 17811, 17822, 17832, 17842, 17852, 17862,
-17872, 17882, 17892, 17902, 17911, 17920, 17930, 17938, 17947, 17956,
-17965, 17974, 17983, 17991, 17999, 18008, 18016, 18025, 18032, 18040,
-18047, 18055, 18063, 18070, 18078, 18085, 18092, 18099, 18106, 18112,
-18119, 18126, 18132, 18138, 18144, 18151, 18157, 18163, 18168, 18174,
-18179, 18185, 18191, 18196, 18201, 18206, 18211, 18216, 18220, 18225,
-18229, 18234, 18238, 18242, 18246, 18250, 18254, 18257, 18260, 18264,
-18268, 18271, 18274, 18277, 18280, 18283, 18286, 18288, 18291, 18293,
-18295, 18297, 18300, 18301, 18303, 18305, 18306, 18308, 18309, 18311,
-18312, 18312, 18314, 18315, 18315, 18316, 18316, 18317, 18317, 18317
-};
-
-Word16 max_rmlt_to_samples_window[MAX_DCT_LENGTH]={
-0, 43, 88, 131, 176, 219, 265, 310, 353, 398,
-442, 487, 532, 575, 620, 663, 709, 754, 797, 842,
-885, 931, 975, 1019, 1064, 1107, 1152, 1197, 1240, 1286,
-1329, 1373, 1419, 1462, 1507, 1550, 1595, 1640, 1683, 1728,
-1771, 1816, 1861, 1904, 1949, 1992, 2037, 2081, 2125, 2170,
-2212, 2258, 2302, 2345, 2390, 2433, 2477, 2522, 2565, 2610,
-2652, 2697, 2742, 2784, 2829, 2872, 2916, 2961, 3004, 3048,
-3091, 3136, 3180, 3223, 3267, 3310, 3354, 3399, 3441, 3485,
-3528, 3572, 3616, 3659, 3703, 3745, 3790, 3834, 3876, 3920,
-3962, 4006, 4050, 4093, 4136, 4179, 4222, 4266, 4309, 4352,
-4394, 4438, 4482, 4524, 4568, 4610, 4653, 4697, 4739, 4782,
-4824, 4867, 4911, 4953, 4996, 5038, 5081, 5124, 5166, 5209,
-5251, 5294, 5337, 5378, 5421, 5463, 5506, 5548, 5590, 5633,
-5674, 5717, 5759, 5800, 5843, 5884, 5927, 5970, 6011, 6053,
-6094, 6136, 6178, 6219, 6262, 6302, 6345, 6387, 6428, 6470,
-6510, 6552, 6594, 6635, 6677, 6717, 6759, 6801, 6841, 6883,
-6922, 6964, 7006, 7046, 7087, 7127, 7169, 7210, 7250, 7291,
-7331, 7372, 7413, 7453, 7494, 7533, 7574, 7615, 7655, 7695,
-7735, 7776, 7816, 7855, 7896, 7935, 7975, 8016, 8054, 8095,
-8134, 8174, 8214, 8253, 8293, 8332, 8371, 8412, 8450, 8490,
-8528, 8568, 8607, 8646, 8685, 8723, 8763, 8802, 8840, 8879,
-8917, 8956, 8995, 9033, 9072, 9109, 9148, 9187, 9225, 9264,
-9301, 9340, 9378, 9415, 9454, 9491, 9529, 9567, 9604, 9642,
-9679, 9717, 9755, 9791, 9829, 9866, 9903, 9941, 9977, 10015,
-10051, 10089, 10126, 10162, 10199, 10235, 10272, 10309, 10345, 10382,
-10417, 10454, 10491, 10526, 10563, 10598, 10635, 10672, 10706, 10742,
-10778, 10814, 10850, 10885, 10921, 10955, 10991, 11027, 11061, 11097,
-11131, 11166, 11202, 11236, 11271, 11305, 11340, 11376, 11409, 11444,
-11478, 11513, 11547, 11580, 11615, 11648, 11683, 11717, 11751, 11785,
-11817, 11852, 11886, 11918, 11952, 11985, 12018, 12053, 12085, 12118,
-12150, 12184, 12217, 12249, 12282, 12314, 12347, 12380, 12411, 12444,
-12476, 12508, 12541, 12572, 12604, 12635, 12668, 12700, 12731, 12763,
-12794, 12826, 12858, 12888, 12920, 12950, 12982, 13013, 13043, 13074,
-13105, 13135, 13166, 13196, 13227, 13257, 13287, 13317, 13347, 13377,
-13407, 13437, 13467, 13496, 13525, 13555, 13585, 13614, 13643, 13672,
-13701, 13730, 13760, 13787, 13817, 13845, 13873, 13903, 13930, 13959,
-13987, 14015, 14043, 14071, 14099, 14126, 14154, 14183, 14209, 14237,
-14264, 14292, 14319, 14346, 14373, 14400, 14427, 14454, 14480, 14507,
-14533, 14560, 14586, 14612, 14639, 14664, 14691, 14717, 14742, 14768,
-14793, 14819, 14845, 14870, 14896, 14920, 14945, 14971, 14996, 15020,
-15044, 15070, 15094, 15118, 15143, 15167, 15192, 15216, 15239, 15263,
-15287, 15311, 15335, 15358, 15382, 15405, 15428, 15452, 15474, 15498,
-15520, 15543, 15566, 15588, 15611, 15633, 15656, 15678, 15700, 15722,
-15744, 15766, 15788, 15809, 15831, 15852, 15874, 15895, 15916, 15937,
-15958, 15979, 16000, 16020, 16041, 16061, 16082, 16103, 16122, 16143,
-16162, 16183, 16203, 16222, 16242, 16261, 16281, 16300, 16319, 16339,
-16357, 16377, 16396, 16414, 16433, 16451, 16470, 16488, 16506, 16525,
-16542, 16561, 16579, 16596, 16614, 16631, 16649, 16667, 16683, 16700,
-16717, 16735, 16752, 16768, 16785, 16801, 16818, 16834, 16850, 16867,
-16883, 16899, 16915, 16930, 16945, 16961, 16977, 16992, 17007, 17022,
-17037, 17052, 17067, 17081, 17096, 17111, 17126, 17140, 17154, 17168,
-17182, 17196, 17209, 17223, 17237, 17250, 17264, 17277, 17290, 17303,
-17315, 17329, 17341, 17354, 17367, 17379, 17391, 17404, 17415, 17428,
-17439, 17451, 17463, 17475, 17486, 17497, 17509, 17520, 17531, 17542,
-17552, 17563, 17574, 17584, 17595, 17605, 17616, 17626, 17636, 17646,
-17655, 17665, 17675, 17684, 17694, 17703, 17712, 17721, 17730, 17739,
-17747, 17756, 17764, 17773, 17781, 17789, 17798, 17806, 17813, 17821,
-17829, 17836, 17843, 17851, 17858, 17866, 17872, 17879, 17886, 17893,
-17899, 17906, 17912, 17918, 17924, 17931, 17937, 17942, 17948, 17953,
-17959, 17964, 17970, 17975, 17980, 17985, 17990, 17995, 17999, 18004,
-18008, 18012, 18016, 18021, 18025, 18028, 18032, 18036, 18039, 18043,
-18046, 18049, 18052, 18055, 18058, 18061, 18064, 18067, 18069, 18071,
-18073, 18075, 18078, 18079, 18081, 18083, 18084, 18086, 18087, 18089,
-18090, 18090, 18091, 18092, 18093, 18094, 18094, 18095, 18095, 18095
-};
diff --git a/sflphone-common/libs/pjproject/third_party/g7221/common/tables.h b/sflphone-common/libs/pjproject/third_party/g7221/common/tables.h
deleted file mode 100644
index ddf29eb3d28795a96ec4cb1ce29d9a56b4367311..0000000000000000000000000000000000000000
--- a/sflphone-common/libs/pjproject/third_party/g7221/common/tables.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/***********************************************************************
-**
-** ITU-T G.722.1 (2005-05) - Fixed point implementation for main body and Annex C
-** > Software Release 2.1 (2008-06)
-** (Simple repackaging; no change from 2005-05 Release 2.0 code)
-**
-** � 1999 PictureTel Coporation
-** Andover, MA, USA
-**
-** All rights reserved.
-**
-***********************************************************************/
-
-/***********************************************************************
- Filename: tables.h
-
- Purpose: Contains table definitions used by G.722.1 Annex C
-
- Design Notes:
-
-***********************************************************************/
-
-/***********************************************************************
- Include files
-***********************************************************************/
-#define REGION_POWER_TABLE_SIZE 64
-#define NUM_CATEGORIES 8
-#define DCT_LENGTH 320
-#define MAX_DCT_LENGTH 640
-
-extern Word16 int_region_standard_deviation_table[REGION_POWER_TABLE_SIZE];
-extern Word16 standard_deviation_inverse_table[REGION_POWER_TABLE_SIZE];
-extern Word16 step_size_inverse_table[NUM_CATEGORIES];
-extern Word16 vector_dimension[NUM_CATEGORIES];
-extern Word16 number_of_vectors[NUM_CATEGORIES];
-/* The last category isn't really coded with scalar quantization. */
-extern Word16 max_bin[NUM_CATEGORIES];
-extern Word16 max_bin_plus_one_inverse[NUM_CATEGORIES];
-extern Word16 int_dead_zone[NUM_CATEGORIES];
-extern Word16 samples_to_rmlt_window[DCT_LENGTH];
-extern Word16 rmlt_to_samples_window[DCT_LENGTH];
-
-/* Add next line in Release 1.2 */
-extern Word16 int_dead_zone_low_bits[NUM_CATEGORIES];
-
-extern Word16 max_samples_to_rmlt_window[MAX_DCT_LENGTH];
-extern Word16 max_rmlt_to_samples_window[MAX_DCT_LENGTH];
diff --git a/sflphone-common/libs/pjproject/third_party/g7221/common/typedef.h b/sflphone-common/libs/pjproject/third_party/g7221/common/typedef.h
deleted file mode 100644
index 6daa80797c367eb3c7fa0b0712f7c114d8cbd0da..0000000000000000000000000000000000000000
--- a/sflphone-common/libs/pjproject/third_party/g7221/common/typedef.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/* $Id: typedef.h 2623 2009-04-20 18:38:15Z bennylp $ */
-/*
- * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com)
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-#ifndef TYPEDEF_H
-#define TYPEDEF_H
-
-#include <pj/types.h>
-
-typedef pj_int8_t Word8;
-typedef pj_int16_t Word16;
-typedef pj_int32_t Word32;
-typedef pj_uint16_t UWord16;
-typedef pj_uint32_t UWord32;
-typedef int Flag;
-
-#endif /* TYPEDEF_H */
-
diff --git a/sflphone-common/libs/pjproject/third_party/g7221/decode/coef2sam.c b/sflphone-common/libs/pjproject/third_party/g7221/decode/coef2sam.c
deleted file mode 100644
index 87deab0ef134506df2e5fc1cd7e3f88d2d0062ca..0000000000000000000000000000000000000000
--- a/sflphone-common/libs/pjproject/third_party/g7221/decode/coef2sam.c
+++ /dev/null
@@ -1,180 +0,0 @@
-/*****************************************************************************
-**
-** ITU-T G.722.1 (2005-05) - Fixed point implementation for main body and Annex C
-** > Software Release 2.1 (2008-06)
-** (Simple repackaging; no change from 2005-05 Release 2.0 code)
-**
-** � 2004 Polycom, Inc.
-**
-** All rights reserved.
-**
-*****************************************************************************/
-
-/*****************************************************************************
-* Filename: rmlt_coefs_to_samples.c
-*
-* Purpose: Convert Reversed MLT (Modulated Lapped Transform)
-* Coefficients to Samples
-*
-* The "Reversed MLT" is an overlapped block transform which uses
-* even symmetry * on the left, odd symmetry on the right and a
-* Type IV DCT as the block transform. * It is thus similar to a
-* MLT which uses odd symmetry on the left, even symmetry * on the
-* right and a Type IV DST as the block transform. In fact, it is
-* equivalent * to reversing the order of the samples, performing
-* an MLT and then negating all * the even-numbered coefficients.
-*
-*****************************************************************************/
-
-/***************************************************************************
- Include files
-***************************************************************************/
-#include "defs.h"
-#include "tables.h"
-#include "count.h"
-
-/***************************************************************************
- Function: rmlt_coefs_to_samples
-
- Syntax: void rmlt_coefs_to_samples(Word16 *coefs,
- Word16 *old_samples,
- Word16 *out_samples,
- Word16 dct_length,
- Word16 mag_shift)
-
- inputs: Word16 *coefs
- Word16 *old_samples
- Word16 dct_length
- Word16 mag_shift
-
-
- outputs: Word16 *out_samples
-
- Description: Converts the mlt_coefs to samples
-
- Design Notes:
-
- WMOPS: 7kHz | 24kbit | 32kbit
- -------|--------------|----------------
- AVG | 1.91 | 1.91
- -------|--------------|----------------
- MAX | 1.91 | 1.91
- -------|--------------|----------------
-
- 14kHz | 24kbit | 32kbit | 48kbit
- -------|--------------|----------------|----------------
- AVG | 3.97 | 3.97 | 3.97
- -------|--------------|----------------|----------------
- MAX | 3.97 | 3.97 | 3.97
- -------|--------------|----------------|----------------
-
-***************************************************************************/
-
-void rmlt_coefs_to_samples(Word16 *coefs,
- Word16 *old_samples,
- Word16 *out_samples,
- Word16 dct_length,
- Word16 mag_shift)
-{
-
-
- Word16 index, vals_left;
- Word16 new_samples[MAX_DCT_LENGTH];
- Word16 *new_ptr, *old_ptr;
- Word16 *win_new, *win_old;
- Word16 *out_ptr;
- Word16 half_dct_size;
- Word32 sum;
-
-
-
- half_dct_size = shr_nocheck(dct_length,1);
-
- /* Perform a Type IV (inverse) DCT on the coefficients */
- dct_type_iv_s(coefs, new_samples, dct_length);
-
- test();
- if (mag_shift > 0)
- {
- for(index=0;index<dct_length;index++)
- {
- new_samples[index] = shr_nocheck(new_samples[index],mag_shift);
- move16();
- }
- }
- else
- {
- test();
- if (mag_shift < 0)
- {
- mag_shift = negate(mag_shift);
- for(index=0;index<dct_length;index++)
- {
- new_samples[index] = shl_nocheck(new_samples[index],mag_shift);
- move16();
- }
- }
-
- }
-
- /* Get the first half of the windowed samples */
-
- out_ptr = out_samples;
- move16();
- test();
- if (dct_length==DCT_LENGTH)
- {
- win_new = rmlt_to_samples_window;
- move16();
- win_old = rmlt_to_samples_window + dct_length;
- move16();
- }
- else
- {
- win_new = max_rmlt_to_samples_window;
- move16();
- win_old = max_rmlt_to_samples_window + dct_length;
- move16();
- }
- old_ptr = old_samples;
- move16();
- new_ptr = new_samples + half_dct_size;
- move16();
-
- for (vals_left = half_dct_size; vals_left > 0; vals_left--)
- {
- sum = 0L;
- move32();
- sum = L_mac(sum,*win_new++, *--new_ptr);
- sum = L_mac(sum,*--win_old, *old_ptr++);
- *out_ptr++ = itu_round(L_shl_nocheck(sum,2));
- move16();
-
- }
-
- /* Get the second half of the windowed samples */
-
- for (vals_left = half_dct_size; vals_left > 0; vals_left--)
- {
- sum = 0L;
- move32();
- sum = L_mac(sum,*win_new++, *new_ptr++);
- sum = L_mac(sum,negate(*--win_old), *--old_ptr);
- *out_ptr++ = itu_round(L_shl_nocheck(sum,2));
- move16();
- }
-
- /* Save the second half of the new samples for */
- /* next time, when they will be the old samples. */
-
- /* pointer arithmetic */
- new_ptr = new_samples + half_dct_size;
- move16();
- old_ptr = old_samples;
- move16();
- for (vals_left = half_dct_size; vals_left > 0; vals_left--)
- {
- *old_ptr++ = *new_ptr++;
- move16();
- }
-}
diff --git a/sflphone-common/libs/pjproject/third_party/g7221/decode/dct4_s.c b/sflphone-common/libs/pjproject/third_party/g7221/decode/dct4_s.c
deleted file mode 100644
index 0123a13bb46fcebb84317c2407056a7be8ff7c26..0000000000000000000000000000000000000000
--- a/sflphone-common/libs/pjproject/third_party/g7221/decode/dct4_s.c
+++ /dev/null
@@ -1,504 +0,0 @@
-/********************************************************************************
-**
-** ITU-T G.722.1 (2005-05) - Fixed point implementation for main body and Annex C
-** > Software Release 2.1 (2008-06)
-** (Simple repackaging; no change from 2005-05 Release 2.0 code)
-**
-** � 2004 Polycom, Inc.
-**
-** All rights reserved.
-**
-********************************************************************************/
-
-/********************************************************************************
-* Filename: dct_type_iv_s.c
-*
-* Purpose: Discrete Cosine Transform, Type IV used for inverse MLT
-*
-* The basis functions are
-*
-* cos(PI*(t+0.5)*(k+0.5)/block_length)
-*
-* for time t and basis function number k. Due to the symmetry of the expression
-* in t and k, it is clear that the forward and inverse transforms are the same.
-*
-*********************************************************************************/
-
-/***************************************************************************
- Include files
-***************************************************************************/
-#include "defs.h"
-#include "count.h"
-#include "dct4_s.h"
-
-/***************************************************************************
- External variable declarations
-***************************************************************************/
-extern Word16 syn_bias_7khz[DCT_LENGTH];
-extern Word16 dither[DCT_LENGTH];
-extern Word16 max_dither[MAX_DCT_LENGTH];
-
-extern Word16 dct_core_s[DCT_LENGTH_DIV_32][DCT_LENGTH_DIV_32];
-extern cos_msin_t s_cos_msin_2[DCT_LENGTH_DIV_32];
-extern cos_msin_t s_cos_msin_4[DCT_LENGTH_DIV_16];
-extern cos_msin_t s_cos_msin_8[DCT_LENGTH_DIV_8];
-extern cos_msin_t s_cos_msin_16[DCT_LENGTH_DIV_4];
-extern cos_msin_t s_cos_msin_32[DCT_LENGTH_DIV_2];
-extern cos_msin_t s_cos_msin_64[DCT_LENGTH];
-extern cos_msin_t *s_cos_msin_table[];
-
-/********************************************************************************
- Function: dct_type_iv_s
-
- Syntax: void dct_type_iv_s (Word16 *input,Word16 *output,Word16 dct_length)
-
-
- Description: Discrete Cosine Transform, Type IV used for inverse MLT
-
- Design Notes:
-
- WMOPS: 7kHz | 24kbit | 32kbit
- -------|--------------|----------------
- AVG | 1.74 | 1.74
- -------|--------------|----------------
- MAX | 1.74 | 1.74
- -------|--------------|----------------
-
- 14kHz | 24kbit | 32kbit | 48kbit
- -------|--------------|----------------|----------------
- AVG | 3.62 | 3.62 | 3.62
- -------|--------------|----------------|----------------
- MAX | 3.62 | 3.62 | 3.62
- -------|--------------|----------------|----------------
-
-********************************************************************************/
-
-void dct_type_iv_s (Word16 *input,Word16 *output,Word16 dct_length)
-{
- Word16 buffer_a[MAX_DCT_LENGTH], buffer_b[MAX_DCT_LENGTH], buffer_c[MAX_DCT_LENGTH];
- Word16 *in_ptr, *in_ptr_low, *in_ptr_high, *next_in_base;
- Word16 *out_ptr_low, *out_ptr_high, *next_out_base;
- Word16 *out_buffer, *in_buffer, *buffer_swap;
- Word16 in_val_low, in_val_high;
- Word16 out_val_low, out_val_high;
- Word16 in_low_even, in_low_odd;
- Word16 in_high_even, in_high_odd;
- Word16 out_low_even, out_low_odd;
- Word16 out_high_even, out_high_odd;
- Word16 *pair_ptr;
- Word16 cos_even, cos_odd, msin_even, msin_odd;
- Word16 set_span, set_count, set_count_log, pairs_left, sets_left;
- Word16 i,k;
- Word16 index;
- Word16 dummy;
- Word32 sum;
- cos_msin_t **table_ptr_ptr, *cos_msin_ptr;
-
- Word32 acca;
- Word16 temp;
-
- Word16 dct_length_log;
- Word16 *dither_ptr;
-
- /*++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
- /* Do the sum/difference butterflies, the first part of */
- /* converting one N-point transform into 32 - 10 point transforms */
- /* transforms, where N = 1 << DCT_LENGTH_LOG. */
- /*++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
- test();
- if (dct_length==DCT_LENGTH)
- {
- dct_length_log = DCT_LENGTH_LOG;
- move16();
- dither_ptr = dither;
- move16();
- }
- else
- {
- dct_length_log = MAX_DCT_LENGTH_LOG;
- move16();
- dither_ptr = max_dither;
- move16();
- }
-
- in_buffer = input;
- move16();
- out_buffer = buffer_a;
- move16();
-
- index=0;
- move16();
-
- i=0;
- move16();
-
- for (set_count_log = 0; set_count_log <= dct_length_log - 2; set_count_log++)
- {
-
- /*===========================================================*/
- /* Initialization for the loop over sets at the current size */
- /*===========================================================*/
-
- /* set_span = 1 << (DCT_LENGTH_LOG - set_count_log); */
- set_span = shr_nocheck(dct_length,set_count_log);
-
- set_count = shl_nocheck(1,set_count_log);
- in_ptr = in_buffer;
- move16();
- next_out_base = out_buffer;
- move16();
-
- /*=====================================*/
- /* Loop over all the sets of this size */
- /*=====================================*/
- temp = sub(index,1);
- test();
- if(temp < 0)
- {
- for (sets_left = set_count;sets_left > 0;sets_left--)
- {
-
- /*||||||||||||||||||||||||||||||||||||||||||||*/
- /* Set up output pointers for the current set */
- /*||||||||||||||||||||||||||||||||||||||||||||*/
- /* pointer arithmetic */
- out_ptr_low = next_out_base;
- move16();
- next_out_base += set_span;
- move16();
- out_ptr_high = next_out_base;
- move16();
-
- /*||||||||||||||||||||||||||||||||||||||||||||||||||*/
- /* Loop over all the butterflies in the current set */
- /*||||||||||||||||||||||||||||||||||||||||||||||||||*/
-
- do
- {
- in_val_low = *in_ptr++;
- move16();
- in_val_high = *in_ptr++;
- move16();
-
- /* BEST METHOD OF GETTING RID OF BIAS, BUT COMPUTATIONALLY UNPLEASANT */
- /* ALTERNATIVE METHOD, SMEARS BIAS OVER THE ENTIRE FRAME, COMPUTATIONALLY SIMPLEST. */
- /* IF THIS WORKS, IT'S PREFERABLE */
-
- dummy = add(in_val_low,dither_ptr[i++]);
- // blp: addition of two 16bits vars, there's no way
- // they'll overflow a 32bit var
- //acca = L_add(dummy,in_val_high);
- acca = dummy + in_val_high;
- out_val_low = extract_l(L_shr_nocheck(acca,1));
-
- dummy = add(in_val_low,dither_ptr[i++]);
- // blp: addition of two 16bits vars, there's no way
- // they'll overflow a 32bit var
- //acca = L_add(dummy,-in_val_high);
- acca = dummy - in_val_high;
- out_val_high = extract_l(L_shr_nocheck(acca,1));
-
- *out_ptr_low++ = out_val_low;
- move16();
- *--out_ptr_high = out_val_high;
- move16();
-
- test();
-
- /* this involves comparison of pointers */
- /* pointer arithmetic */
-
- } while (out_ptr_low < out_ptr_high);
-
- } /* End of loop over sets of the current size */
- }
- else
- {
- for (sets_left = set_count; sets_left > 0; sets_left--)
- {
- /*||||||||||||||||||||||||||||||||||||||||||||*/
- /* Set up output pointers for the current set */
- /*||||||||||||||||||||||||||||||||||||||||||||*/
-
- out_ptr_low = next_out_base;
- move16();
- next_out_base += set_span;
- move16();
- out_ptr_high = next_out_base;
- move16();
-
- /*||||||||||||||||||||||||||||||||||||||||||||||||||*/
- /* Loop over all the butterflies in the current set */
- /*||||||||||||||||||||||||||||||||||||||||||||||||||*/
-
- do
- {
- in_val_low = *in_ptr++;
- move16();
- in_val_high = *in_ptr++;
- move16();
-
- out_val_low = add(in_val_low,in_val_high);
- out_val_high = add(in_val_low,negate(in_val_high));
-
- *out_ptr_low++ = out_val_low;
- move16();
- *--out_ptr_high = out_val_high;
- move16();
-
- test();
- } while (out_ptr_low < out_ptr_high);
-
- } /* End of loop over sets of the current size */
- }
-
- /*============================================================*/
- /* Decide which buffers to use as input and output next time. */
- /* Except for the first time (when the input buffer is the */
- /* subroutine input) we just alternate the local buffers. */
- /*============================================================*/
-
- in_buffer = out_buffer;
- move16();
-
- test();
- if (out_buffer == buffer_a)
- {
- out_buffer = buffer_b;
- move16();
- }
- else
- {
- out_buffer = buffer_a;
- move16();
- }
-
- index = add(index,1);
- } /* End of loop over set sizes */
-
-
- /*++++++++++++++++++++++++++++++++*/
- /* Do 32 - 10 point transforms */
- /*++++++++++++++++++++++++++++++++*/
-
- pair_ptr = in_buffer;
- move16();
- buffer_swap = buffer_c;
- move16();
-
- for (pairs_left = 1 << (dct_length_log - 1); pairs_left > 0; pairs_left--)
- {
- for ( k=0; k<CORE_SIZE; k++ )
- {
-#if PJ_HAS_INT64
- /* blp: danger danger! not really compatible but faster */
- pj_int64_t sum64=0;
- move32();
-
- for ( i=0; i<CORE_SIZE; i++ )
- {
- sum64 += L_mult(pair_ptr[i], dct_core_s[i][k]);
- }
- sum = L_saturate(sum64);
-#else
- sum=0L;
- move32();
-
- for ( i=0; i<CORE_SIZE; i++ )
- {
- sum = L_mac(sum, pair_ptr[i],dct_core_s[i][k]);
- }
-#endif
- buffer_swap[k] = itu_round(sum);
- }
-
- pair_ptr += CORE_SIZE;
- move16();
- buffer_swap += CORE_SIZE;
- move16();
- }
-
- for (i=0;i<dct_length;i++)
- {
- in_buffer[i] = buffer_c[i];
- move16();
- }
-
- table_ptr_ptr = s_cos_msin_table;
- move16();
-
- /*++++++++++++++++++++++++++++++*/
- /* Perform rotation butterflies */
- /*++++++++++++++++++++++++++++++*/
- index=0;
- move16();
-
- for (set_count_log = dct_length_log - 2 ; set_count_log >= 0; set_count_log--)
- {
-
- /*===========================================================*/
- /* Initialization for the loop over sets at the current size */
- /*===========================================================*/
-
- /* set_span = 1 << (DCT_LENGTH_LOG - set_count_log); */
- set_span = shr_nocheck(dct_length,set_count_log);
-
- set_count = shl_nocheck(1,set_count_log);
- next_in_base = in_buffer;
- move16();
- test();
- if (set_count_log == 0)
- {
- next_out_base = output;
- move16();
- }
- else
- {
- next_out_base = out_buffer;
- move16();
- }
-
- /*=====================================*/
- /* Loop over all the sets of this size */
- /*=====================================*/
-
- for (sets_left = set_count; sets_left > 0; sets_left--)
- {
-
- /*|||||||||||||||||||||||||||||||||||||||||*/
- /* Set up the pointers for the current set */
- /*|||||||||||||||||||||||||||||||||||||||||*/
-
- in_ptr_low = next_in_base;
- move16();
-
- temp = shr_nocheck(set_span,1);
- in_ptr_high = in_ptr_low + temp;
- move16();
-
- next_in_base += set_span;
- move16();
-
- out_ptr_low = next_out_base;
- move16();
-
- next_out_base += set_span;
- move16();
- out_ptr_high = next_out_base;
- move16();
-
- cos_msin_ptr = *table_ptr_ptr;
- move16();
-
- /*||||||||||||||||||||||||||||||||||||||||||||||||||||||*/
- /* Loop over all the butterfly pairs in the current set */
- /*||||||||||||||||||||||||||||||||||||||||||||||||||||||*/
-
- do
- {
- in_low_even = *in_ptr_low++;
- move16();
- in_low_odd = *in_ptr_low++;
- move16();
- in_high_even = *in_ptr_high++;
- move16();
- in_high_odd = *in_ptr_high++;
- move16();
- cos_even = cos_msin_ptr[0].cosine;
- move16();
- msin_even = cos_msin_ptr[0].minus_sine;
- move16();
- cos_odd = cos_msin_ptr[1].cosine;
- move16();
- msin_odd = cos_msin_ptr[1].minus_sine;
- move16();
- cos_msin_ptr += 2;
-
- sum = 0L;
- move32();
-
- sum = L_mac(sum,cos_even,in_low_even);
- sum = L_mac(sum,negate(msin_even),in_high_even);
- out_low_even = itu_round(L_shl_nocheck(sum,1));
-
- sum = 0L;
- move32();
- sum = L_mac(sum,msin_even,in_low_even);
- sum = L_mac(sum,cos_even,in_high_even);
- out_high_even = itu_round(L_shl_nocheck(sum,1));
-
- sum = 0L;
- move32();
- sum = L_mac(sum,cos_odd,in_low_odd);
- sum = L_mac(sum,msin_odd,in_high_odd);
- out_low_odd = itu_round(L_shl_nocheck(sum,1));
-
- sum = 0L;
- move32();
- sum = L_mac(sum,msin_odd,in_low_odd);
- sum = L_mac(sum,negate(cos_odd),in_high_odd);
- out_high_odd = itu_round(L_shl_nocheck(sum,1));
-
- *out_ptr_low++ = out_low_even;
- move16();
- *--out_ptr_high = out_high_even;
- move16();
- *out_ptr_low++ = out_low_odd;
- move16();
- *--out_ptr_high = out_high_odd;
- move16();
-
- test();
- } while (out_ptr_low < out_ptr_high);
-
- } /* End of loop over sets of the current size */
-
- /*=============================================*/
- /* Swap input and output buffers for next time */
- /*=============================================*/
-
- buffer_swap = in_buffer;
- move16();
- in_buffer = out_buffer;
- move16();
- out_buffer = buffer_swap;
- move16();
-
- index = add(index,1);
- table_ptr_ptr++;
- }
- /*------------------------------------
-
- ADD IN BIAS FOR OUTPUT
-
- -----------------------------------*/
- if (dct_length==DCT_LENGTH)
- {
- for(i=0;i<320;i++)
- {
- // blp: addition of two 16bits vars, there's no way
- // they'll overflow a 32bit var
- //sum = L_add(output[i],syn_bias_7khz[i]);
- sum = output[i] + syn_bias_7khz[i];
- acca = L_sub(sum,32767);
- test();
- if (acca > 0)
- {
- sum = 32767L;
- move32();
- }
- // blp: addition of two 16bits vars, there's no way
- // they'll overflow 32bit var
- //acca = L_add(sum,32768L);
- acca = sum + 32768;
- test();
- if (acca < 0)
- {
- sum = -32768L;
- move32();
- }
- output[i] = extract_l(sum);
- }
- }
-}
-
diff --git a/sflphone-common/libs/pjproject/third_party/g7221/decode/dct4_s.h b/sflphone-common/libs/pjproject/third_party/g7221/decode/dct4_s.h
deleted file mode 100644
index 010e52d82aa7b2e14c313427a94775e69ce18a7a..0000000000000000000000000000000000000000
--- a/sflphone-common/libs/pjproject/third_party/g7221/decode/dct4_s.h
+++ /dev/null
@@ -1,856 +0,0 @@
-/***********************************************************************
-**
-** ITU-T G.722.1 (2005-05) - Fixed point implementation for main body and Annex C
-** > Software Release 2.1 (2008-06)
-** (Simple repackaging; no change from 2005-05 Release 2.0 code)
-**
-** � 2004 Polycom, Inc.
-**
-** All rights reserved.
-**
-***********************************************************************/
-
-/***********************************************************************
- Filename: dct4_s.h
-
- Purpose: Contains tables used by dct4_s.c
-
- Design Notes:
-
-***********************************************************************/
-
-/***************************************************************************
- Include files
-***************************************************************************/
-
-typedef struct
-{
- Word16 cosine;
- Word16 minus_sine;
-} cos_msin_t;
-
-/***************************************************************************
- The dct_core_s table was generated by the following code
-
- for(i=0;i<10;++i)
- {
- for(k=0;k<10;++k)
- {
- dct_core_s[i][k]=(short) (FTOI(((.9*32768.)*cos(3.1415926*(k+0.5)*(i+0.5)/10.))));
- }
- }
-***************************************************************************/
-Word16 dct_core_s[10][10] = {
-{ 29400, 28676, 27246, 25145, 22425, 19153, 15409, 11286, 6885, 2314 },
-{ 28676, 22425, 11286, -2314, -15409, -25145, -29400, -27246, -19153, -6885 },
-{ 27246, 11286, -11286, -27246, -27246, -11286, 11286, 27246, 27246, 11286 },
-{ 25145, -2314, -27246, -22425, 6885, 28676, 19153, -11286, -29400, -15409 },
-{ 22425, -15409, -27246, 6885, 29400, 2314, -28676, -11286, 25145, 19153 },
-{ 19153, -25145, -11286, 28676, 2314, -29400, 6885, 27246, -15409, -22425 },
-{ 15409, -29400, 11286, 19153, -28676, 6885, 22425, -27246, 2314, 25145 },
-{ 11286, -27246, 27246, -11286, -11286, 27246, -27246, 11286, 11286, -27246 },
-{ 6885, -19153, 27246, -29400, 25145, -15409, 2314, 11286, -22425, 28676 },
-{ 2314, -6885, 11286, -15409, 19153, -22425, 25145, -27246, 28676, -29400 }
-};
-
-Word16 syn_bias_7khz[DCT_LENGTH] = {
- -4, 4, -5, -2, 0, -4, 6, 2, -2, -4,
- -3, 3, 0, 0, -2, 4, 0, 0, 3, -6,
- 8, 5, 4, 5, -8, 0, -2, 0, 0, -3,
- 3, 0, 0, 0, 1, -1, -2, 0, 0, 2,
- -2, -5, -2, 3, 2, -1, -1, -6, 3, 1,
- -7, 4, 4, 0, 1, 4, 1, 0, 1, -5,
- -1, 1, -6, 0, -1, -1, 3, 0, -2, 1,
- 2, -4, 0, 9, 0, -3, 1, 1, 1, 0,
- -3, -2, -1, -4, -2, 0, 5, 2, -3, 5,
- 0, -2, 4, 4, 0, -6, -4, 2, 0, 0,
- 0, -1, -1, -2, 0, 6, 1, 0, 0, -1,
- 0, -4, -1, 0, -4, 1, -1, -5, 0, 1,
- 2, 4, 0, -8, -4, 0, -2, -2, 2, 5,
- -3, -1, 1, -4, 0, 0, 0, -1, -3, 0,
- -5, -4, 0, -2, 0, 7, 1, 0, 5, -2,
- -1, 2, 2, -2, 3, 7, -3, 4, 1, -4,
- 0, 0, 3, -7, -5, 0, 0, 4, 0, -2,
- -1, 0, -5, 0, 2, 0, 11, 5, -1, 0,
- 2, 2, -2, -2, 5, 4, -3, 1, 0, -2,
- 1, 3, 2, 0, 1, 0, 0, 0, 5, 6,
- -2, -1, 0, 2, 3, 2, 0, -3, 4, 5,
- 0, -1, 0, 3, 1, -2, -3, -2, -1, 2,
- -1, -1, -2, -7, 4, 6, -5, -6, -3, -4,
- 0, 2, -5, -2, 3, 0, 0, 0, 2, -2,
- -4, 3, 3, 1, 0, 0, 4, -1, 8, 13,
- 1, 2, 0, 2, 0, -1, 4, -3, 1, 0,
- -1, 3, 0, 0, -5, 0, 6, 2, 4, 5,
- 2, -1, -1, 3, 6, 1, 1, 2, -4, 0,
- -1, -6, -2, -2, 2, 1, 2, 6, 2, 0,
- -2, -2, 0, -1, 2, 0, 0, 3, -2, 1,
- 3, 1, 2, -1, -2, 2, 2, -4, 0, 0,
- -3, 0, -4, -3, 6, 7, 2, 2, 0, -3};
-
-Word16 dither[DCT_LENGTH]= {
- 1, 0, 0, 0, 1, 0, 0, 1, 1, 1,
- 1, 0, 0, 0, 1, 1, 1, 1, 1, 0,
- 0, 1, 1, 1, 0, 1, 1, 0, 0, 0,
- 1, 0, 0, 1, 0, 1, 0, 0, 1, 0,
- 1, 0, 0, 0, 1, 0, 1, 0, 0, 0,
- 1, 1, 1, 1, 1, 0, 0, 1, 0, 0,
- 0, 0, 1, 0, 0, 0, 1, 0, 0, 1,
- 1, 1, 1, 1, 1, 0, 1, 0, 0, 1,
- 1, 0, 0, 1, 0, 0, 0, 1, 0, 1,
- 0, 0, 1, 1, 0, 1, 0, 1, 1, 1,
- 1, 0, 0, 0, 0, 1, 1, 1, 1, 1,
- 0, 0, 0, 1, 0, 1, 0, 0, 0, 1,
- 1, 1, 0, 0, 1, 1, 1, 1, 1, 0,
- 0, 1, 1, 1, 1, 0, 1, 1, 1, 0,
- 1, 1, 1, 0, 0, 0, 0, 0, 0, 0,
- 1, 0, 1, 1, 1, 1, 0, 0, 0, 0,
- 1, 1, 0, 1, 0, 0, 1, 0, 0, 1,
- 0, 0, 0, 1, 1, 0, 0, 1, 1, 1,
- 1, 0, 0, 0, 0, 0, 1, 1, 1, 1,
- 1, 0, 0, 1, 1, 0, 1, 1, 0, 0,
- 1, 1, 1, 0, 1, 1, 0, 1, 0, 1,
- 0, 0, 1, 1, 1, 1, 1, 1, 0, 1,
- 0, 1, 1, 1, 1, 0, 1, 1, 1, 0,
- 1, 1, 1, 0, 1, 1, 1, 0, 1, 0,
- 1, 1, 0, 0, 1, 0, 0, 1, 0, 1,
- 0, 1, 1, 0, 1, 0, 1, 0, 1, 1,
- 1, 0, 1, 0, 1, 0, 1, 1, 1, 1,
- 0, 1, 0, 0, 0, 1, 0, 0, 0, 1,
- 1, 0, 0, 0, 1, 0, 0, 1, 0, 1,
- 1, 0, 1, 1, 0, 0, 1, 1, 0, 1,
- 1, 0, 1, 1, 1, 1, 1, 1, 0, 1,
- 1, 1, 1, 0, 1, 0, 0, 0, 1, 0};
-
-Word16 max_dither[MAX_DCT_LENGTH]= {
- 1, 0, 1, 0, 1, 1, 0, 1, 0, 1,
- 1, 1, 0, 0, 0, 0, 0, 1, 1, 1,
- 1, 1, 1, 0, 1, 1, 0, 0, 0, 1,
- 0, 0, 0, 1, 0, 0, 0, 0, 0, 0,
- 1, 1, 1, 0, 1, 0, 1, 1, 1, 1,
- 0, 1, 0, 1, 1, 1, 1, 1, 1, 0,
- 1, 0, 1, 1, 0, 1, 0, 0, 0, 1,
- 0, 1, 1, 1, 1, 1, 0, 1, 1, 0,
- 0, 0, 1, 1, 0, 0, 0, 1, 1, 1,
- 1, 0, 1, 1, 1, 1, 1, 0, 0, 0,
- 1, 0, 1, 0, 1, 0, 0, 0, 1, 1,
- 0, 1, 1, 1, 1, 1, 1, 0, 1, 0,
- 0, 0, 1, 0, 1, 0, 0, 0, 1, 0,
- 0, 1, 0, 1, 0, 0, 0, 0, 1, 0,
- 1, 0, 0, 1, 0, 1, 0, 0, 0, 1,
- 0, 1, 0, 0, 1, 1, 1, 1, 0, 1,
- 1, 0, 0, 0, 1, 1, 0, 1, 0, 1,
- 0, 1, 0, 1, 0, 1, 1, 1, 0, 1,
- 1, 0, 0, 1, 1, 1, 1, 0, 1, 1,
- 1, 1, 1, 0, 1, 1, 0, 0, 0, 0,
- 1, 0, 1, 0, 0, 0, 0, 1, 1, 0,
- 1, 1, 0, 0, 0, 0, 1, 0, 0, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 0,
- 0, 0, 1, 1, 1, 0, 1, 1, 1, 0,
- 0, 1, 1, 1, 1, 1, 1, 1, 0, 0,
- 1, 1, 1, 1, 1, 1, 0, 1, 1, 1,
- 0, 0, 1, 1, 0, 1, 0, 1, 0, 1,
- 0, 0, 1, 1, 1, 1, 1, 1, 0, 1,
- 0, 1, 1, 1, 0, 1, 0, 1, 0, 0,
- 0, 1, 0, 1, 1, 0, 0, 0, 1, 0,
- 1, 1, 0, 0, 1, 1, 1, 1, 0, 0,
- 0, 0, 1, 1, 1, 1, 0, 0, 1, 1,
- 1, 1, 1, 0, 1, 0, 0, 0, 1, 0,
- 0, 1, 1, 1, 0, 1, 0, 1, 0, 0,
- 1, 1, 0, 1, 0, 1, 1, 0, 0, 0,
- 0, 1, 1, 0, 1, 1, 1, 0, 1, 1,
- 0, 0, 1, 1, 1, 1, 1, 1, 0, 1,
- 1, 1, 0, 0, 0, 1, 1, 1, 1, 0,
- 0, 1, 0, 1, 0, 1, 1, 0, 1, 0,
- 1, 1, 1, 0, 0, 1, 1, 0, 0, 1,
- 0, 1, 0, 0, 0, 1, 1, 0, 0, 1,
- 0, 0, 1, 1, 0, 1, 0, 1, 0, 1,
- 1, 1, 0, 1, 0, 0, 1, 1, 0, 0,
- 1, 0, 1, 0, 1, 0, 0, 1, 0, 0,
- 0, 1, 0, 1, 1, 1, 1, 1, 1, 0,
- 0, 1, 1, 0, 0, 0, 1, 1, 1, 0,
- 1, 1, 1, 0, 1, 1, 1, 0, 0, 0,
- 0, 0, 1, 0, 0, 1, 0, 0, 0, 1,
- 0, 0, 0, 1, 1, 0, 0, 1, 0, 1,
- 1, 1, 1, 1, 0, 0, 1, 0, 1, 0,
- 0, 1, 0, 1, 1, 1, 1, 1, 1, 0,
- 0, 0, 1, 0, 1, 0, 0, 1, 0, 1,
- 1, 0, 1, 0, 1, 1, 0, 0, 1, 1,
- 1, 1, 1, 0, 1, 0, 0, 1, 1, 1,
- 0, 1, 0, 1, 0, 1, 0, 0, 0, 1,
- 1, 0, 0, 1, 0, 0, 1, 1, 0, 1,
- 1, 0, 1, 0, 1, 1, 0, 0, 1, 1,
- 0, 0, 0, 1, 0, 1, 1, 1, 0, 0,
- 1, 0, 1, 0, 1, 1, 0, 0, 0, 1,
- 1, 0, 1, 0, 0, 1, 1, 1, 0, 1,
- 0, 0, 1, 1, 1, 1, 1, 0, 0, 0,
- 0, 1, 0, 1, 0, 0, 1, 0, 1, 0,
- 0, 1, 1, 1, 1, 0, 0, 0, 1, 0,
- 0, 1, 0, 1, 0, 1, 0, 0, 0, 0
-};
-
-
-/********************************************************************************
- The s_cos_min tables were generated by the following code:
- double angle, scale;
- int index;
-
- for (index = 0;index < length;index++)
- {
- angle = scale * ((double)index + 0.5);
- table[index].cosine = (short) (FTOI((18427)* cos(angle)));
- table[index].minus_sine = (short) (FTOI((18427)*(-sin(angle))));
- }
-
-
-********************************************************************************/
-
-cos_msin_t s_cos_msin_2[DCT_LENGTH_DIV_32] = {
- { 18413 , -723 } ,
- { 18299 , -2166 } ,
- { 18073 , -3595 } ,
- { 17735 , -5002 } ,
- { 17288 , -6378 } ,
- { 16734 , -7715 } ,
- { 16077 , -9004 } ,
- { 15321 , -10237 } ,
- { 14471 , -11408 } ,
- { 13531 , -12508 }
- };
-cos_msin_t s_cos_msin_4[DCT_LENGTH_DIV_16] = {
- { 18423 , -362 } ,
- { 18395 , -1085 } ,
- { 18338 , -1806 } ,
- { 18253 , -2525 } ,
- { 18140 , -3239 } ,
- { 17999 , -3949 } ,
- { 17830 , -4653 } ,
- { 17634 , -5349 } ,
- { 17410 , -6037 } ,
- { 17159 , -6716 } ,
- { 16883 , -7385 } ,
- { 16580 , -8042 } ,
- { 16251 , -8686 } ,
- { 15898 , -9318 } ,
- { 15520 , -9935 } ,
- { 15118 , -10536 } ,
- { 14692 , -11122 } ,
- { 14244 , -11690 } ,
- { 13774 , -12240 } ,
- { 13283 , -12772 }
- };
-cos_msin_t s_cos_msin_8[DCT_LENGTH_DIV_8] = {
- { 18426 , -181 } ,
- { 18419 , -543 } ,
- { 18405 , -904 } ,
- { 18384 , -1265 } ,
- { 18355 , -1626 } ,
- { 18320 , -1986 } ,
- { 18277 , -2345 } ,
- { 18228 , -2704 } ,
- { 18171 , -3061 } ,
- { 18107 , -3417 } ,
- { 18037 , -3772 } ,
- { 17959 , -4126 } ,
- { 17875 , -4477 } ,
- { 17783 , -4827 } ,
- { 17685 , -5176 } ,
- { 17580 , -5522 } ,
- { 17468 , -5866 } ,
- { 17350 , -6208 } ,
- { 17225 , -6547 } ,
- { 17093 , -6884 } ,
- { 16954 , -7219 } ,
- { 16809 , -7550 } ,
- { 16658 , -7879 } ,
- { 16500 , -8204 } ,
- { 16336 , -8526 } ,
- { 16165 , -8846 } ,
- { 15988 , -9161 } ,
- { 15805 , -9473 } ,
- { 15616 , -9782 } ,
- { 15421 , -10087 } ,
- { 15220 , -10387 } ,
- { 15013 , -10684 } ,
- { 14801 , -10977 } ,
- { 14582 , -11265 } ,
- { 14358 , -11550 } ,
- { 14129 , -11829 } ,
- { 13894 , -12104 } ,
- { 13654 , -12375 } ,
- { 13408 , -12641 } ,
- { 13157 , -12901 }
- };
-cos_msin_t s_cos_msin_16[DCT_LENGTH_DIV_4] = {
- { 18427 , -90 } ,
- { 18425 , -271 } ,
- { 18421 , -452 } ,
- { 18416 , -633 } ,
- { 18409 , -814 } ,
- { 18400 , -995 } ,
- { 18389 , -1175 } ,
- { 18377 , -1356 } ,
- { 18363 , -1536 } ,
- { 18347 , -1716 } ,
- { 18329 , -1896 } ,
- { 18310 , -2076 } ,
- { 18288 , -2256 } ,
- { 18265 , -2435 } ,
- { 18241 , -2614 } ,
- { 18214 , -2793 } ,
- { 18186 , -2972 } ,
- { 18156 , -3150 } ,
- { 18124 , -3328 } ,
- { 18090 , -3506 } ,
- { 18055 , -3684 } ,
- { 18018 , -3861 } ,
- { 17979 , -4037 } ,
- { 17939 , -4214 } ,
- { 17897 , -4390 } ,
- { 17853 , -4565 } ,
- { 17807 , -4740 } ,
- { 17760 , -4915 } ,
- { 17710 , -5089 } ,
- { 17660 , -5262 } ,
- { 17607 , -5436 } ,
- { 17553 , -5608 } ,
- { 17497 , -5780 } ,
- { 17439 , -5952 } ,
- { 17380 , -6123 } ,
- { 17319 , -6293 } ,
- { 17257 , -6463 } ,
- { 17192 , -6632 } ,
- { 17126 , -6800 } ,
- { 17059 , -6968 } ,
- { 16990 , -7135 } ,
- { 16919 , -7302 } ,
- { 16846 , -7467 } ,
- { 16772 , -7632 } ,
- { 16696 , -7797 } ,
- { 16619 , -7960 } ,
- { 16540 , -8123 } ,
- { 16459 , -8285 } ,
- { 16377 , -8446 } ,
- { 16294 , -8607 } ,
- { 16208 , -8766 } ,
- { 16121 , -8925 } ,
- { 16033 , -9083 } ,
- { 15943 , -9240 } ,
- { 15852 , -9396 } ,
- { 15759 , -9551 } ,
- { 15664 , -9705 } ,
- { 15568 , -9858 } ,
- { 15471 , -10011 } ,
- { 15372 , -10162 } ,
- { 15271 , -10313 } ,
- { 15169 , -10462 } ,
- { 15066 , -10610 } ,
- { 14961 , -10758 } ,
- { 14854 , -10904 } ,
- { 14747 , -11049 } ,
- { 14637 , -11194 } ,
- { 14527 , -11337 } ,
- { 14415 , -11479 } ,
- { 14301 , -11620 } ,
- { 14187 , -11760 } ,
- { 14071 , -11898 } ,
- { 13953 , -12036 } ,
- { 13834 , -12172 } ,
- { 13714 , -12308 } ,
- { 13593 , -12442 } ,
- { 13470 , -12575 } ,
- { 13346 , -12706 } ,
- { 13220 , -12837 } ,
- { 13094 , -12966 }
- };
-cos_msin_t s_cos_msin_32[DCT_LENGTH_DIV_2] = {
- { 18427 , -45 } ,
- { 18427 , -136 } ,
- { 18426 , -226 } ,
- { 18424 , -317 } ,
- { 18423 , -407 } ,
- { 18420 , -497 } ,
- { 18418 , -588 } ,
- { 18415 , -678 } ,
- { 18411 , -769 } ,
- { 18407 , -859 } ,
- { 18403 , -949 } ,
- { 18398 , -1040 } ,
- { 18392 , -1130 } ,
- { 18387 , -1220 } ,
- { 18380 , -1310 } ,
- { 18374 , -1401 } ,
- { 18367 , -1491 } ,
- { 18359 , -1581 } ,
- { 18351 , -1671 } ,
- { 18343 , -1761 } ,
- { 18334 , -1851 } ,
- { 18324 , -1941 } ,
- { 18315 , -2031 } ,
- { 18305 , -2121 } ,
- { 18294 , -2211 } ,
- { 18283 , -2301 } ,
- { 18271 , -2390 } ,
- { 18259 , -2480 } ,
- { 18247 , -2570 } ,
- { 18234 , -2659 } ,
- { 18221 , -2749 } ,
- { 18207 , -2838 } ,
- { 18193 , -2927 } ,
- { 18178 , -3017 } ,
- { 18163 , -3106 } ,
- { 18148 , -3195 } ,
- { 18132 , -3284 } ,
- { 18116 , -3373 } ,
- { 18099 , -3462 } ,
- { 18082 , -3551 } ,
- { 18064 , -3639 } ,
- { 18046 , -3728 } ,
- { 18027 , -3816 } ,
- { 18009 , -3905 } ,
- { 17989 , -3993 } ,
- { 17969 , -4081 } ,
- { 17949 , -4170 } ,
- { 17928 , -4258 } ,
- { 17907 , -4346 } ,
- { 17886 , -4434 } ,
- { 17864 , -4521 } ,
- { 17841 , -4609 } ,
- { 17818 , -4696 } ,
- { 17795 , -4784 } ,
- { 17772 , -4871 } ,
- { 17747 , -4958 } ,
- { 17723 , -5045 } ,
- { 17698 , -5132 } ,
- { 17672 , -5219 } ,
- { 17647 , -5306 } ,
- { 17620 , -5392 } ,
- { 17594 , -5479 } ,
- { 17567 , -5565 } ,
- { 17539 , -5651 } ,
- { 17511 , -5737 } ,
- { 17483 , -5823 } ,
- { 17454 , -5909 } ,
- { 17425 , -5994 } ,
- { 17395 , -6080 } ,
- { 17365 , -6165 } ,
- { 17335 , -6250 } ,
- { 17304 , -6335 } ,
- { 17272 , -6420 } ,
- { 17241 , -6505 } ,
- { 17208 , -6590 } ,
- { 17176 , -6674 } ,
- { 17143 , -6758 } ,
- { 17110 , -6842 } ,
- { 17076 , -6926 } ,
- { 17042 , -7010 } ,
- { 17007 , -7093 } ,
- { 16972 , -7177 } ,
- { 16937 , -7260 } ,
- { 16901 , -7343 } ,
- { 16864 , -7426 } ,
- { 16828 , -7509 } ,
- { 16791 , -7591 } ,
- { 16753 , -7674 } ,
- { 16715 , -7756 } ,
- { 16677 , -7838 } ,
- { 16638 , -7919 } ,
- { 16599 , -8001 } ,
- { 16560 , -8082 } ,
- { 16520 , -8164 } ,
- { 16480 , -8245 } ,
- { 16439 , -8325 } ,
- { 16398 , -8406 } ,
- { 16357 , -8486 } ,
- { 16315 , -8567 } ,
- { 16272 , -8647 } ,
- { 16230 , -8726 } ,
- { 16187 , -8806 } ,
- { 16143 , -8885 } ,
- { 16100 , -8964 } ,
- { 16055 , -9043 } ,
- { 16011 , -9122 } ,
- { 15966 , -9200 } ,
- { 15920 , -9279 } ,
- { 15875 , -9357 } ,
- { 15829 , -9435 } ,
- { 15782 , -9512 } ,
- { 15735 , -9589 } ,
- { 15688 , -9667 } ,
- { 15640 , -9744 } ,
- { 15592 , -9820 } ,
- { 15544 , -9897 } ,
- { 15495 , -9973 } ,
- { 15446 , -10049 } ,
- { 15396 , -10124 } ,
- { 15347 , -10200 } ,
- { 15296 , -10275 } ,
- { 15246 , -10350 } ,
- { 15195 , -10425 } ,
- { 15143 , -10499 } ,
- { 15092 , -10573 } ,
- { 15040 , -10647 } ,
- { 14987 , -10721 } ,
- { 14934 , -10794 } ,
- { 14881 , -10868 } ,
- { 14828 , -10941 } ,
- { 14774 , -11013 } ,
- { 14719 , -11086 } ,
- { 14665 , -11158 } ,
- { 14610 , -11230 } ,
- { 14555 , -11301 } ,
- { 14499 , -11372 } ,
- { 14443 , -11444 } ,
- { 14387 , -11514 } ,
- { 14330 , -11585 } ,
- { 14273 , -11655 } ,
- { 14216 , -11725 } ,
- { 14158 , -11795 } ,
- { 14100 , -11864 } ,
- { 14041 , -11933 } ,
- { 13983 , -12002 } ,
- { 13924 , -12070 } ,
- { 13864 , -12138 } ,
- { 13804 , -12206 } ,
- { 13744 , -12274 } ,
- { 13684 , -12341 } ,
- { 13623 , -12408 } ,
- { 13562 , -12475 } ,
- { 13501 , -12541 } ,
- { 13439 , -12608 } ,
- { 13377 , -12673 } ,
- { 13314 , -12739 } ,
- { 13252 , -12804 } ,
- { 13189 , -12869 } ,
- { 13125 , -12934 } ,
- { 13062 , -12998 }
- };
-cos_msin_t s_cos_msin_64[DCT_LENGTH] = {
-{18426, -21},
-{18426, -66},
-{18426, -110},
-{18426, -154},
-{18425, -198},
-{18425, -242},
-{18424, -286},
-{18424, -331},
-{18423, -374},
-{18421, -419},
-{18421, -463},
-{18419, -507},
-{18418, -552},
-{18417, -595},
-{18415, -639},
-{18414, -684},
-{18412, -728},
-{18410, -772},
-{18408, -816},
-{18406, -860},
-{18404, -904},
-{18402, -949},
-{18400, -992},
-{18397, -1037},
-{18394, -1081},
-{18392, -1125},
-{18389, -1169},
-{18387, -1213},
-{18384, -1257},
-{18380, -1301},
-{18378, -1345},
-{18374, -1389},
-{18371, -1433},
-{18367, -1477},
-{18364, -1521},
-{18360, -1566},
-{18356, -1609},
-{18352, -1653},
-{18348, -1697},
-{18344, -1742},
-{18339, -1785},
-{18335, -1829},
-{18331, -1873},
-{18326, -1917},
-{18322, -1961},
-{18317, -2005},
-{18312, -2049},
-{18307, -2092},
-{18302, -2137},
-{18297, -2180},
-{18292, -2224},
-{18286, -2268},
-{18281, -2312},
-{18275, -2356},
-{18270, -2399},
-{18264, -2443},
-{18258, -2487},
-{18252, -2531},
-{18246, -2574},
-{18240, -2618},
-{18233, -2662},
-{18227, -2706},
-{18220, -2749},
-{18214, -2793},
-{18207, -2836},
-{18200, -2880},
-{18193, -2924},
-{18186, -2967},
-{18179, -3011},
-{18172, -3055},
-{18164, -3098},
-{18157, -3142},
-{18149, -3185},
-{18141, -3229},
-{18134, -3272},
-{18126, -3316},
-{18118, -3359},
-{18109, -3403},
-{18101, -3446},
-{18094, -3489},
-{18085, -3533},
-{18076, -3576},
-{18068, -3619},
-{18059, -3663},
-{18050, -3706},
-{18041, -3749},
-{18032, -3792},
-{18023, -3836},
-{18014, -3879},
-{18005, -3922},
-{17995, -3965},
-{17986, -4008},
-{17975, -4051},
-{17966, -4094},
-{17956, -4138},
-{17946, -4180},
-{17936, -4224},
-{17926, -4266},
-{17916, -4309},
-{17905, -4353},
-{17895, -4395},
-{17884, -4438},
-{17874, -4481},
-{17863, -4524},
-{17852, -4567},
-{17841, -4609},
-{17830, -4652},
-{17819, -4695},
-{17807, -4738},
-{17796, -4780},
-{17784, -4823},
-{17772, -4865},
-{17761, -4908},
-{17749, -4951},
-{17738, -4993},
-{17725, -5036},
-{17713, -5078},
-{17701, -5121},
-{17689, -5163},
-{17676, -5205},
-{17664, -5248},
-{17651, -5290},
-{17638, -5333},
-{17626, -5375},
-{17613, -5417},
-{17599, -5459},
-{17586, -5501},
-{17573, -5544},
-{17560, -5586},
-{17546, -5627},
-{17533, -5670},
-{17519, -5712},
-{17505, -5753},
-{17492, -5795},
-{17478, -5837},
-{17464, -5879},
-{17450, -5921},
-{17435, -5963},
-{17421, -6005},
-{17406, -6046},
-{17392, -6088},
-{17377, -6130},
-{17363, -6172},
-{17348, -6213},
-{17333, -6254},
-{17318, -6296},
-{17303, -6338},
-{17288, -6379},
-{17272, -6420},
-{17257, -6462},
-{17241, -6503},
-{17225, -6545},
-{17210, -6586},
-{17194, -6627},
-{17178, -6668},
-{17162, -6709},
-{17145, -6750},
-{17130, -6791},
-{17113, -6832},
-{17097, -6874},
-{17080, -6915},
-{17064, -6956},
-{17047, -6996},
-{17030, -7037},
-{17013, -7078},
-{16996, -7119},
-{16979, -7159},
-{16962, -7200},
-{16945, -7241},
-{16927, -7281},
-{16910, -7322},
-{16892, -7362},
-{16874, -7403},
-{16856, -7444},
-{16838, -7484},
-{16821, -7524},
-{16802, -7564},
-{16784, -7605},
-{16766, -7645},
-{16748, -7685},
-{16729, -7725},
-{16711, -7765},
-{16692, -7805},
-{16674, -7845},
-{16654, -7885},
-{16635, -7925},
-{16616, -7964},
-{16597, -8004},
-{16578, -8044},
-{16559, -8084},
-{16539, -8124},
-{16520, -8164},
-{16500, -8203},
-{16480, -8242},
-{16461, -8282},
-{16441, -8322},
-{16421, -8361},
-{16401, -8400},
-{16380, -8440},
-{16360, -8479},
-{16340, -8518},
-{16319, -8557},
-{16299, -8597},
-{16278, -8635},
-{16257, -8674},
-{16237, -8713},
-{16215, -8752},
-{16195, -8791},
-{16173, -8829},
-{16152, -8868},
-{16131, -8907},
-{16110, -8946},
-{16088, -8985},
-{16067, -9023},
-{16045, -9061},
-{16023, -9100},
-{16001, -9138},
-{15979, -9176},
-{15957, -9215},
-{15935, -9253},
-{15913, -9291},
-{15891, -9329},
-{15868, -9367},
-{15846, -9405},
-{15823, -9443},
-{15800, -9481},
-{15778, -9519},
-{15755, -9557},
-{15732, -9595},
-{15709, -9632},
-{15686, -9670},
-{15662, -9708},
-{15639, -9745},
-{15615, -9782},
-{15592, -9820},
-{15569, -9857},
-{15544, -9894},
-{15521, -9932},
-{15497, -9969},
-{15473, -10006},
-{15449, -10043},
-{15425, -10080},
-{15401, -10117},
-{15377, -10154},
-{15352, -10191},
-{15327, -10227},
-{15303, -10264},
-{15278, -10301},
-{15254, -10337},
-{15229, -10374},
-{15204, -10411},
-{15180, -10447},
-{15154, -10483},
-{15129, -10519},
-{15104, -10556},
-{15078, -10592},
-{15053, -10628},
-{15027, -10664},
-{15002, -10700},
-{14976, -10736},
-{14950, -10772},
-{14924, -10808},
-{14898, -10844},
-{14872, -10879},
-{14846, -10915},
-{14820, -10950},
-{14794, -10985},
-{14767, -11021},
-{14741, -11056},
-{14714, -11092},
-{14687, -11127},
-{14661, -11162},
-{14635, -11197},
-{14607, -11232},
-{14581, -11267},
-{14554, -11302},
-{14526, -11337},
-{14499, -11372},
-{14472, -11407},
-{14444, -11441},
-{14417, -11476},
-{14389, -11511},
-{14362, -11545},
-{14334, -11579},
-{14306, -11614},
-{14278, -11648},
-{14251, -11682},
-{14222, -11716},
-{14194, -11750},
-{14166, -11784},
-{14137, -11818},
-{14109, -11852},
-{14081, -11886},
-{14053, -11919},
-{14023, -11953},
-{13995, -11987},
-{13966, -12020},
-{13937, -12054},
-{13909, -12087},
-{13879, -12120},
-{13851, -12153},
-{13821, -12187},
-{13792, -12220},
-{13763, -12253},
-{13733, -12286},
-{13704, -12319},
-{13674, -12351},
-{13645, -12385},
-{13615, -12417},
-{13585, -12450},
-{13555, -12482},
-{13525, -12514},
-{13495, -12546},
-{13465, -12579},
-{13435, -12611},
-{13405, -12644},
-{13374, -12676},
-{13345, -12708},
-{13314, -12739},
-{13283, -12772}
-};
-
-
-
-cos_msin_t *s_cos_msin_table[] = {s_cos_msin_2, s_cos_msin_4,
- s_cos_msin_8, s_cos_msin_16,
- s_cos_msin_32, s_cos_msin_64
- };
-
diff --git a/sflphone-common/libs/pjproject/third_party/g7221/decode/decoder.c b/sflphone-common/libs/pjproject/third_party/g7221/decode/decoder.c
deleted file mode 100644
index ab81a300b20d1941c00be747f3f2393d7084e988..0000000000000000000000000000000000000000
--- a/sflphone-common/libs/pjproject/third_party/g7221/decode/decoder.c
+++ /dev/null
@@ -1,1113 +0,0 @@
-/***************************************************************************
-**
-** ITU-T G.722.1 (2005-05) - Fixed point implementation for main body and Annex C
-** > Software Release 2.1 (2008-06)
-** (Simple repackaging; no change from 2005-05 Release 2.0 code)
-**
-** � 2004 Polycom, Inc.
-**
-** All rights reserved.
-**
-***************************************************************************/
-
-/***************************************************************************
- Filename: decoder.c
-
- Purpose: Contains files used to implement the G.722.1 Annex C decoder
-
- Design Notes:
-
-***************************************************************************/
-
-/***************************************************************************
- Include files
-***************************************************************************/
-#include "defs.h"
-#include "tables.h"
-#include "huff_def.h"
-#include "count.h"
-
-
-/***************************************************************************
- Function: decoder
-
- Syntax: void decoder(Bit_Obj *bitobj,
- Rand_Obj *randobj,
- Word16 number_of_regions,
- Word16 *decoder_mlt_coefs,
- Word16 *p_mag_shift,
- Word16 *p_old_mag_shift,
- Word16 *old_decoder_mlt_coefs,
- Word16 frame_error_flag)
-
- inputs: Bit_Obj *bitobj
- Rand_Obj *randobj
- Word16 number_of_regions
- Word16 *p_old_mag_shift
- Word16 *old_decoder_mlt_coefs
- Word16 frame_error_flag
-
- outputs: Word16 *decoder_mlt_coefs,
- Word16 *p_mag_shift,
-
-
-
- Description: Decodes the out_words into mlt coefs using G.722.1 Annex C
-
- Design Notes:
-
- WMOPS: 7kHz | 24kbit | 32kbit
- -------|-------------|----------------
- AVG | 0.84 | 0.94
- -------|-------------|----------------
- MAX | 0.90 | 1.00
- -------|-------------|----------------
-
- 14kHz | 24kbit | 32kbit | 48kbit
- -------|-------------|----------------|----------------
- AVG | 1.31 | 1.56 | 1.88
- -------|-------------|----------------|----------------
- MAX | 1.59 | 1.80 | 1.98
- -------|-------------|----------------|----------------
-
-***************************************************************************/
-void decoder(Bit_Obj *bitobj,
- Rand_Obj *randobj,
- Word16 number_of_regions,
- Word16 *decoder_mlt_coefs,
- Word16 *p_mag_shift,
- Word16 *p_old_mag_shift,
- Word16 *old_decoder_mlt_coefs,
- Word16 frame_error_flag)
-{
-
-
- Word16 absolute_region_power_index[MAX_NUMBER_OF_REGIONS];
- Word16 decoder_power_categories[MAX_NUMBER_OF_REGIONS];
- Word16 decoder_category_balances[MAX_NUM_CATEGORIZATION_CONTROL_POSSIBILITIES-1];
- UWord16 categorization_control;
- Word16 decoder_region_standard_deviation[MAX_NUMBER_OF_REGIONS];
- Word16 i;
-
- Word16 num_categorization_control_bits;
- Word16 num_categorization_control_possibilities;
- Word16 number_of_coefs;
- Word16 number_of_valid_coefs;
-
-
- test();
- if (number_of_regions==NUMBER_OF_REGIONS)
- {
- num_categorization_control_bits = NUM_CATEGORIZATION_CONTROL_BITS;
- move16();
- num_categorization_control_possibilities = NUM_CATEGORIZATION_CONTROL_POSSIBILITIES;
- move16();
- number_of_coefs = DCT_LENGTH;
- move16();
- number_of_valid_coefs = NUMBER_OF_VALID_COEFS;
- move16();
- }
- else
- {
- num_categorization_control_bits = MAX_NUM_CATEGORIZATION_CONTROL_BITS;
- move16();
- num_categorization_control_possibilities = MAX_NUM_CATEGORIZATION_CONTROL_POSSIBILITIES;
- move16();
- number_of_coefs = MAX_DCT_LENGTH;
- move16();
- number_of_valid_coefs = MAX_NUMBER_OF_VALID_COEFS;
- move16();
- }
-
- test();
- if (frame_error_flag == 0)
- {
-
- /* convert the bits to absolute region power index and decoder_region_standard_deviation */
-
- decode_envelope(bitobj,
- number_of_regions,
- decoder_region_standard_deviation,
- absolute_region_power_index,
- p_mag_shift);
-
- /* fill the categorization_control with NUM_CATEGORIZATION_CONTROL_BITS */
- categorization_control = 0;
- for (i=0; i<num_categorization_control_bits; i++)
- {
- get_next_bit(bitobj);
- categorization_control = shl_nocheck(categorization_control,1);
- categorization_control = add(categorization_control,bitobj->next_bit);
- }
-
- bitobj->number_of_bits_left = sub(bitobj->number_of_bits_left,num_categorization_control_bits);
-
- /* obtain decoder power categories and category balances */
- /* based on the absolute region power index */
- categorize(bitobj->number_of_bits_left,
- number_of_regions,
- num_categorization_control_possibilities,
- absolute_region_power_index,
- decoder_power_categories,
- decoder_category_balances);
-
- /* perform adjustmaents to the power categories and category balances based on the cat control */
- rate_adjust_categories(categorization_control,
- decoder_power_categories,
- decoder_category_balances);
-
- /* decode the quantized bits into mlt coefs */
- decode_vector_quantized_mlt_indices(bitobj,
- randobj,
- number_of_regions,
- decoder_region_standard_deviation,
- decoder_power_categories,
- decoder_mlt_coefs);
-
- /* test for frame errors */
- test_4_frame_errors(bitobj,
- number_of_regions,
- num_categorization_control_possibilities,
- &frame_error_flag,
- categorization_control,
- absolute_region_power_index);
- }
-
- /* perform error handling operations */
- error_handling(number_of_coefs,
- number_of_valid_coefs,
- &frame_error_flag,
- decoder_mlt_coefs,
- old_decoder_mlt_coefs,
- p_mag_shift,
- p_old_mag_shift);
-
-}
-
-/***************************************************************************
- Function: decode_envelope
-
- Syntax: void decode_envelope(Bit_Obj *bitobj,
- Word16 number_of_regions,
- Word16 *decoder_region_standard_deviation,
- Word16 *absolute_region_power_index,
- Word16 *p_mag_shift)
-
- inputs: Bit_Obj *bitobj
- Word16 number_of_regions
-
-
- outputs: Word16 *decoder_region_standard_deviation
- Word16 *absolute_region_power_index
- Word16 *p_mag_shift
-
-
- Description: Recover differential_region_power_index from code bits
-
- Design Notes:
-
- WMOPS: 7kHz | 24kbit | 32kbit
- -------|--------------|----------------
- AVG | 0.04 | 0.04
- -------|--------------|----------------
- MAX | 0.05 | 0.05
- -------|--------------|----------------
-
- 14kHz | 24kbit | 32kbit | 48kbit
- -------|--------------|----------------|----------------
- AVG | 0.08 | 0.08 | 0.08
- -------|--------------|----------------|----------------
- MAX | 0.10 | 0.10 | 0.10
- -------|--------------|----------------|----------------
-
-***************************************************************************/
-void decode_envelope(Bit_Obj *bitobj,
- Word16 number_of_regions,
- Word16 *decoder_region_standard_deviation,
- Word16 *absolute_region_power_index,
- Word16 *p_mag_shift)
-
-{
- Word16 region;
- Word16 i;
- Word16 index;
- Word16 differential_region_power_index[MAX_NUMBER_OF_REGIONS];
- Word16 max_index;
-
- Word16 temp;
- Word16 temp1;
- Word16 temp2;
- Word32 acca;
-
- index = 0;
- move16();
-
- /* get 5 bits from the current code word */
- for (i=0; i<5; i++)
- {
- get_next_bit(bitobj);
- index = shl_nocheck(index,1);
- index = add(index,bitobj->next_bit);
- }
- bitobj->number_of_bits_left = sub(bitobj->number_of_bits_left,5);
-
- /* ESF_ADJUSTMENT_TO_RMS_INDEX compensates for the current (9/30/96)
- IMLT being scaled to high by the ninth power of sqrt(2). */
- differential_region_power_index[0] = sub(index,ESF_ADJUSTMENT_TO_RMS_INDEX);
- move16();
-
- /* obtain differential_region_power_index */
- for (region=1; region<number_of_regions; region++)
- {
- index = 0;
- move16();
- do
- {
- get_next_bit(bitobj);
- test();
- if (bitobj->next_bit == 0)
- {
- index = differential_region_power_decoder_tree[region][index][0];
- move16();
- }
- else
- {
- index = differential_region_power_decoder_tree[region][index][1];
- move16();
- }
- bitobj->number_of_bits_left = sub(bitobj->number_of_bits_left,1);
- test();
- } while (index > 0);
-
- differential_region_power_index[region] = negate(index);
- move16();
- }
-
- /* Reconstruct absolute_region_power_index[] from differential_region_power_index[]. */
- absolute_region_power_index[0] = differential_region_power_index[0];
- move16();
- for (region=1; region<number_of_regions; region++)
- {
- acca = L_add(absolute_region_power_index[region-1],differential_region_power_index[region]);
- acca = L_add(acca,DRP_DIFF_MIN);
- absolute_region_power_index[region] = extract_l(acca);
- }
-
- /* Reconstruct decoder_region_standard_deviation[] from absolute_region_power_index[]. */
- /* DEBUG!!!! - This integer method jointly computes the mag_shift
- and the standard deviations already mag_shift compensated. It
- relies on REGION_POWER_STEPSIZE_DB being exactly 3.010299957 db
- or a square root of 2 chnage in standard deviation. If
- REGION_POWER_STEPSIZE_DB changes, this software must be
- reworked. */
-
- temp = 0;
- move16();
- max_index = 0;
- move16();
- for (region=0; region<number_of_regions; region++)
- {
- acca = L_add(absolute_region_power_index[region],REGION_POWER_TABLE_NUM_NEGATIVES);
- i = extract_l(acca);
-
- temp1 = sub(i,max_index);
- test();
- if (temp1 > 0)
- {
- max_index = i;
- move16();
- }
- temp = add(temp,int_region_standard_deviation_table[i]);
- }
- i = 9;
- move16();
-
- temp1 = sub(temp,8);
- temp2 = sub(max_index,28);
- test();
- test();
- logic16();
- test();
- logic16();
- while ((i >= 0) && ((temp1 >= 0) || (temp2 > 0)))
- {
- i = sub(i,1);
- temp = shr_nocheck(temp,1);
- max_index = sub(max_index,2);
- temp1 = sub(temp,8);
- temp2 = sub(max_index,28);
- test();
- test();
- logic16();
- test();
- logic16();
- }
-
- *p_mag_shift = i;
- move16();
-
- /* pointer arithmetic */
- temp = (Word16 )(REGION_POWER_TABLE_NUM_NEGATIVES + (*p_mag_shift * 2));
-
- for (region=0; region<number_of_regions; region++)
- {
- acca = L_add(absolute_region_power_index[region],temp);
- i = extract_l(acca);
- decoder_region_standard_deviation[region] = int_region_standard_deviation_table[i];
- move16();
- }
-
-}
-
-/***************************************************************************
- Function: rate_adjust_categories
-
- Syntax: void rate_adjust_categories(Word16 categorization_control,
- Word16 *decoder_power_categories,
- Word16 *decoder_category_balances)
-
- inputs: Word16 categorization_control,
- Word16 *decoder_power_categories,
- Word16 *decoder_category_balances
-
- outputs: Word16 categorization_control,
- Word16 *decoder_power_categories,
-
- Description: Adjust the power categories based on the categorization control
-
- Design Notes:
-
- WMOPS: 7kHz | 24kbit | 32kbit
- -------|--------------|----------------
- AVG | 0.00 | 0.00
- -------|--------------|----------------
- MAX | 0.00 | 0.00
- -------|--------------|----------------
-
- 14kHz | 24kbit | 32kbit | 48kbit
- -------|--------------|----------------|----------------
- AVG | 0.00 | 0.00 | 0.00
- -------|--------------|----------------|----------------
- MAX | 0.01 | 0.01 | 0.01
- -------|--------------|----------------|----------------
-
-***************************************************************************/
-void rate_adjust_categories(Word16 categorization_control,
- Word16 *decoder_power_categories,
- Word16 *decoder_category_balances)
-{
- Word16 i;
- Word16 region;
-
- i = 0;
- move16();
-
- test();
- while (categorization_control > 0)
- {
- region = decoder_category_balances[i++];
- move16();
- decoder_power_categories[region] = add(decoder_power_categories[region],1);
- move16();
- categorization_control = sub(categorization_control,1);
- }
-
-}
-
-/***************************************************************************
- Function: decode_vector_quantized_mlt_indices
-
- Syntax: void decode_vector_quantized_mlt_indices(Bit_Obj *bitobj,
- Rand_Obj *randobj,
- Word16 number_of_regions,
- Word16 *decoder_region_standard_deviation,
- Word16 *decoder_power_categories,
- Word16 *decoder_mlt_coefs)
- inputs: Bit_Obj *bitobj
- Rand_Obj *randobj
- Word16 number_of_regions
- Word16 *decoder_region_standard_deviation
- Word16 *decoder_power_categories
-
-
- outputs: Word16 *decoder_mlt_coefs
-
-
- Description: Decode MLT coefficients
-
- Design Notes:
-
- WMOPS: 7kHz | 24kbit | 32kbit
- -------|--------------|----------------
- AVG | 0.60 | 0.72
- -------|--------------|----------------
- MAX | 0.67 | 0.76
- -------|--------------|----------------
-
- 14kHz | 24kbit | 32kbit | 48kbit
- -------|--------------|----------------|----------------
- AVG | 0.77 | 0.98 | 1.28
- -------|--------------|----------------|----------------
- MAX | 1.05 | 1.18 | 1.36
- -------|--------------|----------------|----------------
-
-***************************************************************************/
-void decode_vector_quantized_mlt_indices(Bit_Obj *bitobj,
- Rand_Obj *randobj,
- Word16 number_of_regions,
- Word16 *decoder_region_standard_deviation,
- Word16 *decoder_power_categories,
- Word16 *decoder_mlt_coefs)
-{
- Word16 standard_deviation;
- Word16 *decoder_mlt_ptr;
- Word16 decoder_mlt_value;
- Word16 noifillpos;
- Word16 noifillneg;
- Word16 noise_fill_factor[3] = {5793,8192,23170};
- Word16 region;
- Word16 category;
- Word16 j,n;
- Word16 k[MAX_VECTOR_DIMENSION];
- Word16 vec_dim;
- Word16 num_vecs;
- Word16 index;
- Word16 bit=0;
- Word16 signs_index=0;
- Word16 num_sign_bits;
- Word16 ran_out_of_bits_flag;
- Word16 *decoder_table_ptr;
- Word16 random_word;
-
- Word16 temp1;
- Word16 temp;
- Word32 acca;
-
- ran_out_of_bits_flag = 0;
- move16();
-
- for (region=0; region<number_of_regions; region++)
- {
- category = (Word16)decoder_power_categories[region];
- move16();
- acca = L_mult0(region,REGION_SIZE);
- index = extract_l(acca);
- decoder_mlt_ptr = &decoder_mlt_coefs[index];
- move16();
- standard_deviation = decoder_region_standard_deviation[region];
- move16();
-
- temp = sub(category,7);
- test();
- if (temp < 0)
- {
- /* Get the proper table of decoder tables, vec_dim, and num_vecs for the cat */
- decoder_table_ptr = (Word16 *) table_of_decoder_tables[category];
- move16();
- vec_dim = vector_dimension[category];
- move16();
- num_vecs = number_of_vectors[category];
- move16();
-
- for (n=0; n<num_vecs; n++)
- {
- index = 0;
- move16();
-
- /* get index */
- do
- {
- test();
- if (bitobj->number_of_bits_left <= 0)
- {
- ran_out_of_bits_flag = 1;
- move16();
- break;
- }
-
- get_next_bit(bitobj);
-
- test();
- if (bitobj->next_bit == 0)
- {
- temp = shl_nocheck(index,1);
- index = (Word16)*(decoder_table_ptr + temp);
- move16();
- }
- else
- {
- temp = shl_nocheck(index,1);
- index = (Word16)*(decoder_table_ptr + temp + 1);
- move16();
- }
- bitobj->number_of_bits_left = sub(bitobj->number_of_bits_left,1);
- test();
-
- } while (index > 0);
-
- test();
- if (ran_out_of_bits_flag != 0)
- break;
-
- index = negate(index);
-
- /* convert index into array used to access the centroid table */
- /* get the number of sign bits in the index */
- num_sign_bits = index_to_array(index,k,category);
-
- temp = sub(bitobj->number_of_bits_left,num_sign_bits);
- test();
- if (temp >= 0)
- {
-
- test();
- if (num_sign_bits != 0)
- {
- signs_index = 0;
- move16();
- for (j=0; j<num_sign_bits; j++)
- {
- get_next_bit(bitobj);
- signs_index = shl_nocheck(signs_index,1);
- signs_index = add(signs_index,bitobj->next_bit);
- bitobj->number_of_bits_left = sub(bitobj->number_of_bits_left,1);
- }
- temp = sub(num_sign_bits,1);
- bit = shl_nocheck(1,(temp));
- }
-
- for (j=0; j<vec_dim; j++)
- {
- acca = L_mult0(standard_deviation,mlt_quant_centroid[category][k[j]]);
- acca = L_shr_nocheck(acca,12);
- decoder_mlt_value = extract_l(acca);
-
- test();
- if (decoder_mlt_value != 0)
- {
- test();
- if ((signs_index & bit) == 0)
- decoder_mlt_value = negate(decoder_mlt_value);
- bit = shr_nocheck(bit,1);
- }
- *decoder_mlt_ptr++ = decoder_mlt_value;
- move16();
- }
- }
- else
- {
- ran_out_of_bits_flag = 1;
- move16();
- break;
- }
- }
- /* If ran out of bits during decoding do noise fill for remaining regions. */
- /* DEBUG!! - For now also redo all of last region with all noise fill. */
- test();
- if (ran_out_of_bits_flag != 0)
- {
- temp = add(region,1);
- for (j=temp; j<number_of_regions; j++)
- {
- decoder_power_categories[j] = 7;
- move16();
- }
- category = 7;
- move16();
- decoder_mlt_ptr = &decoder_mlt_coefs[region*REGION_SIZE];
- move16();
- }
- }
-
- temp = sub(category,5);
- temp1 = sub(category,6);
- test();
- test();
- logic16();
- if ((temp == 0) || (temp1 == 0))
- {
-
- decoder_mlt_ptr = &decoder_mlt_coefs[region*REGION_SIZE];
- move16();
- noifillpos = mult(standard_deviation,noise_fill_factor[category - 5]);
- noifillneg = negate(noifillpos);
-
- random_word = get_rand(randobj);
-
- for (j=0; j<10; j++)
- {
- test();
- if (*decoder_mlt_ptr == 0)
- {
- logic16();
- test();
- if ((random_word & 1) == 0)
- {
- temp1 = noifillneg;
- move16();
- }
- else
- {
- temp1 = noifillpos;
- move16();
- }
- *decoder_mlt_ptr = temp1;
- move16();
- random_word = shr_nocheck(random_word,1);
- }
- /* pointer arithmetic */
- decoder_mlt_ptr++;
- }
- random_word = get_rand(randobj);
- for (j=0; j<10; j++)
- {
- test();
- if (*decoder_mlt_ptr == 0)
- {
- logic16();
- test();
- if ((random_word & 1) == 0)
- {
- temp1 = noifillneg;
- move16();
- }
- else
- {
- temp1 = noifillpos;
- move16();
- }
- *decoder_mlt_ptr = temp1;
- move16();
- random_word = shr_nocheck(random_word,1);
- }
- /* pointer arithmetic */
- decoder_mlt_ptr++;
- }
- }
-
- /* if (category == 7) */
- temp1 = sub(category,7);
- test();
- if (temp1 == 0)
- {
- index = sub(category,5);
- noifillpos = mult(standard_deviation,noise_fill_factor[index]);
- noifillneg = negate(noifillpos);
-
- random_word = get_rand(randobj);
- for (j=0; j<10; j++)
- {
- logic16();
- test();
- if ((random_word & 1) == 0)
- {
- temp1 = noifillneg;
- move16();
- }
- else
- {
- temp1 = noifillpos;
- move16();
- }
- *decoder_mlt_ptr++ = temp1;
- move16();
- random_word = shr_nocheck(random_word,1);
- }
- random_word = get_rand(randobj);
- for (j=0; j<10; j++)
- {
- logic16();
- test();
- if ((random_word & 1) == 0)
- {
- temp1 = noifillneg;
- move16();
- }
- else
- {
- temp1 = noifillpos;
- move16();
- }
-
- *decoder_mlt_ptr++ = temp1;
- move16();
- random_word = shr_nocheck(random_word,1);
- }
- }
- }
-
- test();
- if (ran_out_of_bits_flag)
- bitobj->number_of_bits_left = sub(bitobj->number_of_bits_left,1);
-}
-/****************************************************************************************
- Function: index_to_array
-
- Syntax: number_of_non_zero = index_to_array(Word16 index,
- Word16 array[MAX_VECTOR_DIMENSION],
- Word16 category)
-
- inputs: Word16 index
- Word16 category
-
- outputs: Word16 array[MAX_VECTOR_DIMENSION] - used in decoder to access
- mlt_quant_centroid table
-
- Word16 number_of_non_zero - number of non zero elements
- in the array
-
- Description: Computes an array of sign bits with the length of the category vector
- Returns the number of sign bits and the array
-
- WMOPS: 7kHz | 24kbit | 32kbit
- -------|--------------|----------------
- AVG | 0.00 | 0.00
- -------|--------------|----------------
- MAX | 0.00 | 0.00
- -------|--------------|----------------
-
- 14kHz | 24kbit | 32kbit | 48kbit
- -------|--------------|----------------|----------------
- AVG | 0.00 | 0.00 | 0.00
- -------|--------------|----------------|----------------
- MAX | 0.00 | 0.00 | 0.00
- -------|--------------|----------------|----------------
-
-****************************************************************************************/
-Word16 index_to_array(Word16 index,Word16 *array,Word16 category)
-{
- Word16 j,q,p;
- Word16 number_of_non_zero;
- Word16 max_bin_plus_one;
- Word16 inverse_of_max_bin_plus_one;
- Word16 temp;
-
- number_of_non_zero = 0;
- move16();
-
- p = index;
- move16();
-
- max_bin_plus_one = add(max_bin[category],1);
- inverse_of_max_bin_plus_one = max_bin_plus_one_inverse[category];
- move16();
-
- temp = sub(vector_dimension[category],1);
- for (j=temp; j>=0; j--)
- {
- q = mult(p,inverse_of_max_bin_plus_one);
- temp = extract_l(L_mult0(q,max_bin_plus_one));
- array[j] = sub(p,temp);
- move16();
-
- p = q;
- move16();
-
- temp = array[j];
- move16();
- test();
- if (temp != 0)
- number_of_non_zero = add(number_of_non_zero,1);
- }
- return(number_of_non_zero);
-}
-/***************************************************************************
- Function: test_4_frame_errors
-
- Syntax: void test_4_frame_errors(Bit_Obj *bitobj,
- Word16 number_of_regions,
- Word16 num_categorization_control_possibilities,
- Word16 *frame_error_flag,
- Word16 categorization_control,
- Word16 *absolute_region_power_index)
-
- inputs: bit_obj
- number_of_regions
- num_categorization_control_possibilities
- frame_error_flag
- categorization_control
- absolute_region_power_index
-
-
- outputs: frame_error_flag
-
-
-
-
- Description: Tests for error conditions and sets the frame_error_flag accordingly
-
- Design Notes:
-
- WMOPS: 7kHz | 24kbit | 32kbit
- -------|--------------|----------------
- AVG | 0.01 | 0.01
- -------|--------------|----------------
- MAX | 0.04 | 0.08
- -------|--------------|----------------
-
- 14kHz | 24kbit | 32kbit | 48kbit
- -------|--------------|----------------|----------------
- AVG | 0.01 | 0.01 | 0.01
- -------|--------------|----------------|----------------
- MAX | 0.02 | 0.06 | 0.08
- -------|--------------|----------------|----------------
-
-***************************************************************************/
-void test_4_frame_errors(Bit_Obj *bitobj,
- Word16 number_of_regions,
- Word16 num_categorization_control_possibilities,
- Word16 *frame_error_flag,
- Word16 categorization_control,
- Word16 *absolute_region_power_index)
-{
- Word16 region;
- Word16 i;
- Word16 temp;
- Word32 acca;
- Word32 accb;
-
- /* Test for bit stream errors. */
-
- test();
- if (bitobj->number_of_bits_left > 0)
- {
- for (i=0; i<bitobj->number_of_bits_left; i++)
- {
- get_next_bit(bitobj);
- test();
- if (bitobj->next_bit == 0)
- {
- *frame_error_flag = 1;
- move16();
- }
- }
- }
- else
- {
- temp = sub(categorization_control,sub(num_categorization_control_possibilities,1));
- test();
- if (temp < 0)
- {
- test();
- if (bitobj->number_of_bits_left < 0)
- {
- *frame_error_flag |= 2;
- logic16();
- }
- }
- }
-
- /* checks to ensure that abs_region_power_index is within range */
- /* the error flag is set if it is out of range */
- for (region=0; region<number_of_regions; region++)
- {
- /* the next two lines of comments were modified in release 1.2
- * to correct the description of the range of
- * absolute_region_power_index[] to be tested in the next
- * 9 lines of code.
- */
- /* if ((absolute_region_power_index[region] > 31) ||
- (absolute_region_power_index[region] < -8) */
-
- acca = L_add(absolute_region_power_index[region],ESF_ADJUSTMENT_TO_RMS_INDEX);
- accb = L_sub(acca,31);
- acca = L_add(acca,8);
- test();
-
- /* the next line was modifed in release 1.2 to
- * correct miss typed code and error checking.
- */
- if ((accb > 0) || (acca < 0))
- {
- *frame_error_flag |= 4;
- logic16();
- }
- }
-
-}
-/***************************************************************************
- Function: error_handling
-
- Syntax: void error_handling(Word16 number_of_coefs,
- Word16 number_of_valid_coefs,
- Word16 *frame_error_flag,
- Word16 *decoder_mlt_coefs,
- Word16 *old_decoder_mlt_coefs,
- Word16 *p_mag_shift,
- Word16 *p_old_mag_shift)
-
- inputs: number_of_coefs
- number_of_valid_coefs
- frame_error_flag
- old_decoder_mlt_coefs
- p_old_mag_shift
-
-
- outputs: decoder_mlt_coefs
- old_decoder_mlt_coefs
- p_mag_shift
- p_old_mag_shift
-
-
-
- Description: If both the current and previous frames are errored,
- set the mlt coefficients to 0. If only the current frame
- is errored, then repeat the previous frame's mlt coefficients.
-
- Design Notes:
-
- WMOPS: 7kHz | 24kbit | 32kbit
- -------|--------------|----------------
- AVG | 0.02 | 0.02
- -------|--------------|----------------
- MAX | 0.03 | 0.03
- -------|--------------|----------------
-
- 14kHz | 24kbit | 32kbit | 48kbit
- -------|--------------|----------------|----------------
- AVG | 0.03 | 0.03 | 0.03
- -------|--------------|----------------|----------------
- MAX | 0.03 | 0.03 | 0.06
- -------|--------------|----------------|----------------
-
-***************************************************************************/
-void error_handling(Word16 number_of_coefs,
- Word16 number_of_valid_coefs,
- Word16 *frame_error_flag,
- Word16 *decoder_mlt_coefs,
- Word16 *old_decoder_mlt_coefs,
- Word16 *p_mag_shift,
- Word16 *p_old_mag_shift)
-{
- Word16 i;
-
- test();
- if (*frame_error_flag != 0)
- {
-
- for (i = 0; i < number_of_valid_coefs; i++)
- {
- decoder_mlt_coefs[i] = old_decoder_mlt_coefs[i];
- move16();
- }
-
- for (i = 0; i < number_of_valid_coefs; i++)
- {
- old_decoder_mlt_coefs[i] = 0;
- move16();
- }
-
- *p_mag_shift = *p_old_mag_shift;
- move16();
-
- *p_old_mag_shift = 0;
- move16();
- }
- else
- {
- /* Store in case next frame is errored. */
- for (i = 0; i < number_of_valid_coefs; i++)
- {
- old_decoder_mlt_coefs[i] = decoder_mlt_coefs[i];
- move16();
- }
-
- *p_old_mag_shift = *p_mag_shift;
- move16();
- }
-
-
- /* Zero out the upper 1/8 of the spectrum. */
- for (i = number_of_valid_coefs; i < number_of_coefs; i++)
- {
- decoder_mlt_coefs[i] = 0;
- move16();
- }
-
-}
-/****************************************************************************************
- Function: get_next_bit
-
- Syntax: void get_next_bit(Bit_Obj *bitobj)
-
- Description: Returns the next bit in the current word inside the bit object
-
- WMOPS: 7kHz | 24kbit | 32kbit
- -------|--------------|----------------
- AVG | 0.00 | 0.00
- -------|--------------|----------------
- MAX | 0.00 | 0.00
- -------|--------------|----------------
-
- 14kHz | 24kbit | 32kbit | 48kbit
- -------|--------------|----------------|----------------
- AVG | 0.00 | 0.00 | 0.00
- -------|--------------|----------------|----------------
- MAX | 0.00 | 0.00 | 0.00
- -------|--------------|----------------|----------------
-
-****************************************************************************************/
-void get_next_bit(Bit_Obj *bitobj)
-{
- Word16 temp;
-
- test();
- if (bitobj->code_bit_count == 0)
- {
- bitobj->current_word = *bitobj->code_word_ptr++;
- move16();
- bitobj->code_bit_count = 16;
- move16();
- }
- bitobj->code_bit_count = sub(bitobj->code_bit_count,1);
- temp = shr_nocheck(bitobj->current_word,bitobj->code_bit_count);
- logic16();
- bitobj->next_bit = (Word16 )(temp & 1);
-
-}
-/****************************************************************************************
- Function: get_rand
-
- Syntax: Word16 get_rand(Rand_Obj *randobj)
-
- Description: Returns a random Word16 based on the seeds inside the rand object
-
- WMOPS: 7kHz | 24kbit | 32kbit
- -------|--------------|----------------
- AVG | 0.00 | 0.00
- -------|--------------|----------------
- MAX | 0.00 | 0.00
- -------|--------------|----------------
-
- 14kHz | 24kbit | 32kbit | 48kbit
- -------|--------------|----------------|----------------
- AVG | 0.00 | 0.00 | 0.00
- -------|--------------|----------------|----------------
- MAX | 0.00 | 0.00 | 0.00
- -------|--------------|----------------|----------------
-
-****************************************************************************************/
-Word16 get_rand(Rand_Obj *randobj)
-{
- Word16 random_word;
- Word32 acca;
-
- acca = L_add(randobj->seed0,randobj->seed3);
- random_word = extract_l(acca);
-
- logic16();
- test();
- if ((random_word & 32768L) != 0)
- random_word = add(random_word,1);
-
- randobj->seed3 = randobj->seed2;
- move16();
- randobj->seed2 = randobj->seed1;
- move16();
- randobj->seed1 = randobj->seed0;
- move16();
- randobj->seed0 = random_word;
- move16();
-
- return(random_word);
-}
diff --git a/sflphone-common/libs/pjproject/third_party/g7221/encode/dct4_a.c b/sflphone-common/libs/pjproject/third_party/g7221/encode/dct4_a.c
deleted file mode 100644
index 94ddf9fe4917e6e68ee8ff5a4466f9e4cb1b8955..0000000000000000000000000000000000000000
--- a/sflphone-common/libs/pjproject/third_party/g7221/encode/dct4_a.c
+++ /dev/null
@@ -1,367 +0,0 @@
-/*********************************************************************************
-** ITU-T G.722.1 (2005-05) - Fixed point implementation for main body and Annex C
-** > Software Release 2.1 (2008-06)
-** (Simple repackaging; no change from 2005-05 Release 2.0 code)
-**
-** � 2004 Polycom, Inc.
-**
-** All rights reserved.
-**
-*********************************************************************************/
-
-/*********************************************************************************
-* Filename: dct_type_iv_a.c
-*
-* Purpose: Discrete Cosine Transform, Type IV used for MLT
-*
-* The basis functions are
-*
-* cos(PI*(t+0.5)*(k+0.5)/block_length)
-*
-* for time t and basis function number k. Due to the symmetry of the expression
-* in t and k, it is clear that the forward and inverse transforms are the same.
-*
-*********************************************************************************/
-
-/*********************************************************************************
- Include files
-*********************************************************************************/
-#include "defs.h"
-#include "count.h"
-#include "dct4_a.h"
-
-/*********************************************************************************
- External variable declarations
-*********************************************************************************/
-extern Word16 anal_bias[DCT_LENGTH];
-extern Word16 dct_core_a[DCT_LENGTH_DIV_32][DCT_LENGTH_DIV_32];
-extern cos_msin_t a_cos_msin_2 [DCT_LENGTH_DIV_32];
-extern cos_msin_t a_cos_msin_4 [DCT_LENGTH_DIV_16];
-extern cos_msin_t a_cos_msin_8 [DCT_LENGTH_DIV_8];
-extern cos_msin_t a_cos_msin_16[DCT_LENGTH_DIV_4];
-extern cos_msin_t a_cos_msin_32[DCT_LENGTH_DIV_2];
-extern cos_msin_t a_cos_msin_64[DCT_LENGTH];
-extern cos_msin_t *a_cos_msin_table[];
-
-/*********************************************************************************
- Function: dct_type_iv_a
-
- Syntax: void dct_type_iv_a (input, output, dct_length)
- Word16 input[], output[], dct_length;
-
- Description: Discrete Cosine Transform, Type IV used for MLT
-
- Design Notes:
-
- WMOPS: | 24kbit | 32kbit
- -------|--------------|----------------
- AVG | 1.14 | 1.14
- -------|--------------|----------------
- MAX | 1.14 | 1.14
- -------|--------------|----------------
-
- 14kHz | 24kbit | 32kbit | 48kbit
- -------|--------------|----------------|----------------
- AVG | 2.57 | 2.57 | 2.57
- -------|--------------|----------------|----------------
- MAX | 2.57 | 2.57 | 2.57
- -------|--------------|----------------|----------------
-
-*********************************************************************************/
-
-void dct_type_iv_a (Word16 *input,Word16 *output,Word16 dct_length)
-{
- Word16 buffer_a[MAX_DCT_LENGTH], buffer_b[MAX_DCT_LENGTH], buffer_c[MAX_DCT_LENGTH];
- Word16 *in_ptr, *in_ptr_low, *in_ptr_high, *next_in_base;
- Word16 *out_ptr_low, *out_ptr_high, *next_out_base;
- Word16 *out_buffer, *in_buffer, *buffer_swap;
- Word16 in_val_low, in_val_high;
- Word16 out_val_low, out_val_high;
- Word16 in_low_even, in_low_odd;
- Word16 in_high_even, in_high_odd;
- Word16 out_low_even, out_low_odd;
- Word16 out_high_even, out_high_odd;
- Word16 *pair_ptr;
- Word16 cos_even, cos_odd, msin_even, msin_odd;
- Word16 neg_cos_odd;
- Word16 neg_msin_even;
- Word32 sum;
- Word16 set_span, set_count, set_count_log, pairs_left, sets_left;
- Word16 i,k;
- Word16 index;
- cos_msin_t **table_ptr_ptr, *cos_msin_ptr;
-
- Word16 temp;
- Word32 acca;
-
- Word16 dct_length_log;
-
-
- /*++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
- /* Do the sum/difference butterflies, the first part of */
- /* converting one N-point transform into N/2 two-point */
- /* transforms, where N = 1 << DCT_LENGTH_LOG. = 64/128 */
- /*++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
- test();
- if (dct_length==DCT_LENGTH)
- {
- dct_length_log = DCT_LENGTH_LOG;
-
- /* Add bias offsets */
- for (i=0;i<dct_length;i++)
- {
- input[i] = add(input[i],anal_bias[i]);
- move16();
- }
- }
- else
- dct_length_log = MAX_DCT_LENGTH_LOG;
-
- index = 0L;
- move16();
-
- in_buffer = input;
- move16();
-
- out_buffer = buffer_a;
- move16();
-
- temp = sub(dct_length_log,2);
- for (set_count_log=0;set_count_log<=temp;set_count_log++)
- {
-
- /*===========================================================*/
- /* Initialization for the loop over sets at the current size */
- /*===========================================================*/
-
- /* set_span = 1 << (DCT_LENGTH_LOG - set_count_log); */
- set_span = shr_nocheck(dct_length,set_count_log);
-
- set_count = shl_nocheck(1,set_count_log);
-
- in_ptr = in_buffer;
- move16();
-
- next_out_base = out_buffer;
- move16();
-
- /*=====================================*/
- /* Loop over all the sets of this size */
- /*=====================================*/
-
- for (sets_left=set_count;sets_left>0;sets_left--)
- {
-
- /*||||||||||||||||||||||||||||||||||||||||||||*/
- /* Set up output pointers for the current set */
- /*||||||||||||||||||||||||||||||||||||||||||||*/
-
- out_ptr_low = next_out_base;
- next_out_base = next_out_base + set_span;
- out_ptr_high = next_out_base;
-
- /*||||||||||||||||||||||||||||||||||||||||||||||||||*/
- /* Loop over all the butterflies in the current set */
- /*||||||||||||||||||||||||||||||||||||||||||||||||||*/
-
- do
- {
- in_val_low = *in_ptr++;
- in_val_high = *in_ptr++;
- // blp: addition of two 16bits vars, there's no way
- // they'll overflow a 32bit var
- //acca = L_add(in_val_low,in_val_high);
- acca = (in_val_low + in_val_high);
- acca = L_shr_nocheck(acca,1);
- out_val_low = extract_l(acca);
-
- acca = L_sub(in_val_low,in_val_high);
- acca = L_shr_nocheck(acca,1);
- out_val_high = extract_l(acca);
-
- *out_ptr_low++ = out_val_low;
- *--out_ptr_high = out_val_high;
-
- test();
- } while (out_ptr_low < out_ptr_high);
-
- } /* End of loop over sets of the current size */
-
- /*============================================================*/
- /* Decide which buffers to use as input and output next time. */
- /* Except for the first time (when the input buffer is the */
- /* subroutine input) we just alternate the local buffers. */
- /*============================================================*/
-
- in_buffer = out_buffer;
- move16();
- if (out_buffer == buffer_a)
- out_buffer = buffer_b;
- else
- out_buffer = buffer_a;
- index = add(index,1);
-
- } /* End of loop over set sizes */
-
-
- /*++++++++++++++++++++++++++++++++*/
- /* Do N/2 two-point transforms, */
- /* where N = 1 << DCT_LENGTH_LOG */
- /*++++++++++++++++++++++++++++++++*/
-
- pair_ptr = in_buffer;
- move16();
-
- buffer_swap = buffer_c;
- move16();
-
- temp = sub(dct_length_log,1);
- temp = shl_nocheck(1,temp);
-
- for (pairs_left=temp; pairs_left > 0; pairs_left--)
- {
- for ( k=0; k<CORE_SIZE; k++ )
- {
-#if PJ_HAS_INT64
- /* blp: danger danger! not really compatible but faster */
- pj_int64_t sum64=0;
- move32();
-
- for ( i=0; i<CORE_SIZE; i++ )
- {
- sum64 += L_mult(pair_ptr[i], dct_core_a[i][k]);
- }
- sum = L_saturate(sum64);
-#else
- sum=0L;
- move32();
- for ( i=0; i<CORE_SIZE; i++ )
- {
- sum = L_mac(sum, pair_ptr[i],dct_core_a[i][k]);
- }
-#endif
- buffer_swap[k] = itu_round(sum);
- }
- /* address arithmetic */
- pair_ptr += CORE_SIZE;
- buffer_swap += CORE_SIZE;
- }
-
- for (i=0;i<dct_length;i++)
- {
- in_buffer[i] = buffer_c[i];
- move16();
- }
-
- table_ptr_ptr = a_cos_msin_table;
-
- /*++++++++++++++++++++++++++++++*/
- /* Perform rotation butterflies */
- /*++++++++++++++++++++++++++++++*/
- temp = sub(dct_length_log,2);
- for (set_count_log = temp; set_count_log >= 0; set_count_log--)
- {
- /*===========================================================*/
- /* Initialization for the loop over sets at the current size */
- /*===========================================================*/
- /* set_span = 1 << (DCT_LENGTH_LOG - set_count_log); */
- set_span = shr_nocheck(dct_length,set_count_log);
-
- set_count = shl_nocheck(1,set_count_log);
- next_in_base = in_buffer;
- move16();
-
- test();
- if (set_count_log == 0)
- {
- next_out_base = output;
- }
- else
- {
- next_out_base = out_buffer;
- }
-
-
- /*=====================================*/
- /* Loop over all the sets of this size */
- /*=====================================*/
- for (sets_left = set_count; sets_left > 0;sets_left--)
- {
- /*|||||||||||||||||||||||||||||||||||||||||*/
- /* Set up the pointers for the current set */
- /*|||||||||||||||||||||||||||||||||||||||||*/
- in_ptr_low = next_in_base;
- move16();
- temp = shr_nocheck(set_span,1);
-
- /* address arithmetic */
- in_ptr_high = in_ptr_low + temp;
- next_in_base += set_span;
- out_ptr_low = next_out_base;
- next_out_base += set_span;
- out_ptr_high = next_out_base;
- cos_msin_ptr = *table_ptr_ptr;
-
- /*||||||||||||||||||||||||||||||||||||||||||||||||||||||*/
- /* Loop over all the butterfly pairs in the current set */
- /*||||||||||||||||||||||||||||||||||||||||||||||||||||||*/
-
- do
- {
- /* address arithmetic */
- in_low_even = *in_ptr_low++;
- in_low_odd = *in_ptr_low++;
- in_high_even = *in_ptr_high++;
- in_high_odd = *in_ptr_high++;
- cos_even = cos_msin_ptr[0].cosine;
- move16();
- msin_even = cos_msin_ptr[0].minus_sine;
- move16();
- cos_odd = cos_msin_ptr[1].cosine;
- move16();
- msin_odd = cos_msin_ptr[1].minus_sine;
- move16();
- cos_msin_ptr += 2;
-
- sum = 0L;
- sum=L_mac(sum,cos_even,in_low_even);
- neg_msin_even = negate(msin_even);
- sum=L_mac(sum,neg_msin_even,in_high_even);
- out_low_even = itu_round(sum);
-
- sum = 0L;
- sum=L_mac(sum,msin_even,in_low_even);
- sum=L_mac(sum,cos_even,in_high_even);
- out_high_even= itu_round(sum);
-
- sum = 0L;
- sum=L_mac(sum,cos_odd,in_low_odd);
- sum=L_mac(sum,msin_odd,in_high_odd);
- out_low_odd= itu_round(sum);
-
- sum = 0L;
- sum=L_mac(sum,msin_odd,in_low_odd);
- neg_cos_odd = negate(cos_odd);
- sum=L_mac(sum,neg_cos_odd,in_high_odd);
- out_high_odd= itu_round(sum);
-
- *out_ptr_low++ = out_low_even;
- *--out_ptr_high = out_high_even;
- *out_ptr_low++ = out_low_odd;
- *--out_ptr_high = out_high_odd;
- test();
- } while (out_ptr_low < out_ptr_high);
-
- } /* End of loop over sets of the current size */
-
- /*=============================================*/
- /* Swap input and output buffers for next time */
- /*=============================================*/
-
- buffer_swap = in_buffer;
- in_buffer = out_buffer;
- out_buffer = buffer_swap;
- table_ptr_ptr++;
- }
-}
-
diff --git a/sflphone-common/libs/pjproject/third_party/g7221/encode/dct4_a.h b/sflphone-common/libs/pjproject/third_party/g7221/encode/dct4_a.h
deleted file mode 100644
index 74f3d9397a8484852914827050c3275834fb057e..0000000000000000000000000000000000000000
--- a/sflphone-common/libs/pjproject/third_party/g7221/encode/dct4_a.h
+++ /dev/null
@@ -1,728 +0,0 @@
-/****************************************************************************
-**
-** ITU-T G.722.1 (2005-05) - Fixed point implementation for main body and Annex C
-** > Software Release 2.1 (2008-06)
-** (Simple repackaging; no change from 2005-05 Release 2.0 code)
-**
-** � 2004 Polycom, Inc.
-**
-** All rights reserved.
-**
-****************************************************************************/
-
-/****************************************************************************
- Filename: dct4_a.h
-
- Purpose: Contains tables used by dct4_a.c
-
- Design Notes:
-
-****************************************************************************/
-
-/***************************************************************************
- Include files
-***************************************************************************/
-#include <stdio.h>
-#include <math.h>
-
-typedef struct
-{
- Word16 cosine;
- Word16 minus_sine;
-} cos_msin_t;
-
-cos_msin_t a_cos_msin_2[10] = {
- { 29805 , -1171 } ,
- { 29621 , -3506 } ,
- { 29255 , -5819 } ,
- { 28708 , -8097 } ,
- { 27984 , -10324 } ,
- { 27088 , -12488 } ,
- { 26025 , -14575 } ,
- { 24801 , -16572 } ,
- { 23425 , -18466 } ,
- { 21903 , -20247 }
- };
-cos_msin_t a_cos_msin_4[20] = {
- { 29822 , -586 } ,
- { 29776 , -1756 } ,
- { 29684 , -2924 } ,
- { 29547 , -4087 } ,
- { 29364 , -5244 } ,
- { 29135 , -6392 } ,
- { 28862 , -7531 } ,
- { 28544 , -8659 } ,
- { 28182 , -9773 } ,
- { 27776 , -10871 } ,
- { 27328 , -11954 } ,
- { 26838 , -13017 } ,
- { 26306 , -14061 } ,
- { 25734 , -15083 } ,
- { 25122 , -16081 } ,
- { 24471 , -17055 } ,
- { 23783 , -18003 } ,
- { 23057 , -18923 } ,
- { 22297 , -19813 } ,
- { 21502 , -20673 }
- };
-cos_msin_t a_cos_msin_8[40] = {
- { 29827 , -293 } ,
- { 29815 , -878 } ,
- { 29792 , -1464 } ,
- { 29758 , -2048 } ,
- { 29712 , -2632 } ,
- { 29654 , -3215 } ,
- { 29586 , -3797 } ,
- { 29505 , -4377 } ,
- { 29414 , -4955 } ,
- { 29311 , -5532 } ,
- { 29196 , -6106 } ,
- { 29071 , -6678 } ,
- { 28934 , -7248 } ,
- { 28786 , -7814 } ,
- { 28627 , -8378 } ,
- { 28457 , -8938 } ,
- { 28276 , -9495 } ,
- { 28084 , -10049 } ,
- { 27882 , -10598 } ,
- { 27668 , -11144 } ,
- { 27444 , -11685 } ,
- { 27209 , -12221 } ,
- { 26964 , -12753 } ,
- { 26709 , -13280 } ,
- { 26443 , -13802 } ,
- { 26167 , -14318 } ,
- { 25881 , -14829 } ,
- { 25584 , -15335 } ,
- { 25278 , -15834 } ,
- { 24963 , -16327 } ,
- { 24637 , -16814 } ,
- { 24302 , -17295 } ,
- { 23958 , -17769 } ,
- { 23605 , -18236 } ,
- { 23242 , -18695 } ,
- { 22871 , -19148 } ,
- { 22490 , -19594 } ,
- { 22101 , -20031 } ,
- { 21704 , -20461 } ,
- { 21298 , -20884 }
- };
-cos_msin_t a_cos_msin_16[80] = {
- { 29828 , -146 } ,
- { 29825 , -439 } ,
- { 29819 , -732 } ,
- { 29811 , -1025 } ,
- { 29799 , -1317 } ,
- { 29785 , -1610 } ,
- { 29767 , -1902 } ,
- { 29747 , -2194 } ,
- { 29724 , -2486 } ,
- { 29698 , -2778 } ,
- { 29670 , -3069 } ,
- { 29638 , -3360 } ,
- { 29604 , -3651 } ,
- { 29567 , -3942 } ,
- { 29526 , -4232 } ,
- { 29483 , -4521 } ,
- { 29438 , -4811 } ,
- { 29389 , -5099 } ,
- { 29338 , -5388 } ,
- { 29283 , -5676 } ,
- { 29226 , -5963 } ,
- { 29166 , -6249 } ,
- { 29103 , -6535 } ,
- { 29038 , -6821 } ,
- { 28969 , -7106 } ,
- { 28898 , -7390 } ,
- { 28824 , -7673 } ,
- { 28748 , -7956 } ,
- { 28668 , -8237 } ,
- { 28586 , -8518 } ,
- { 28501 , -8799 } ,
- { 28413 , -9078 } ,
- { 28323 , -9357 } ,
- { 28229 , -9634 } ,
- { 28133 , -9911 } ,
- { 28035 , -10187 } ,
- { 27933 , -10461 } ,
- { 27829 , -10735 } ,
- { 27723 , -11008 } ,
- { 27613 , -11279 } ,
- { 27501 , -11550 } ,
- { 27387 , -11819 } ,
- { 27269 , -12088 } ,
- { 27149 , -12355 } ,
- { 27027 , -12621 } ,
- { 26901 , -12885 } ,
- { 26774 , -13149 } ,
- { 26643 , -13411 } ,
- { 26510 , -13672 } ,
- { 26375 , -13932 } ,
- { 26237 , -14190 } ,
- { 26096 , -14447 } ,
- { 25953 , -14702 } ,
- { 25807 , -14956 } ,
- { 25659 , -15209 } ,
- { 25509 , -15460 } ,
- { 25356 , -15710 } ,
- { 25200 , -15958 } ,
- { 25043 , -16205 } ,
- { 24882 , -16450 } ,
- { 24720 , -16693 } ,
- { 24554 , -16935 } ,
- { 24387 , -17175 } ,
- { 24217 , -17414 } ,
- { 24045 , -17651 } ,
- { 23871 , -17886 } ,
- { 23694 , -18119 } ,
- { 23515 , -18351 } ,
- { 23334 , -18581 } ,
- { 23150 , -18809 } ,
- { 22964 , -19036 } ,
- { 22776 , -19260 } ,
- { 22586 , -19483 } ,
- { 22394 , -19704 } ,
- { 22199 , -19923 } ,
- { 22003 , -20140 } ,
- { 21804 , -20355 } ,
- { 21603 , -20568 } ,
- { 21400 , -20779 } ,
- { 21195 , -20988 }
- };
-cos_msin_t a_cos_msin_32[160]= {
- { 29828 , -73 } ,
- { 29827 , -220 } ,
- { 29826 , -366 } ,
- { 29824 , -512 } ,
- { 29821 , -659 } ,
- { 29817 , -805 } ,
- { 29813 , -952 } ,
- { 29808 , -1098 } ,
- { 29802 , -1244 } ,
- { 29796 , -1390 } ,
- { 29789 , -1537 } ,
- { 29781 , -1683 } ,
- { 29772 , -1829 } ,
- { 29763 , -1975 } ,
- { 29753 , -2121 } ,
- { 29742 , -2267 } ,
- { 29730 , -2413 } ,
- { 29718 , -2559 } ,
- { 29705 , -2705 } ,
- { 29692 , -2851 } ,
- { 29677 , -2997 } ,
- { 29662 , -3142 } ,
- { 29646 , -3288 } ,
- { 29630 , -3433 } ,
- { 29613 , -3579 } ,
- { 29595 , -3724 } ,
- { 29576 , -3869 } ,
- { 29557 , -4014 } ,
- { 29537 , -4159 } ,
- { 29516 , -4304 } ,
- { 29494 , -4449 } ,
- { 29472 , -4594 } ,
- { 29449 , -4738 } ,
- { 29426 , -4883 } ,
- { 29401 , -5027 } ,
- { 29376 , -5172 } ,
- { 29351 , -5316 } ,
- { 29324 , -5460 } ,
- { 29297 , -5604 } ,
- { 29269 , -5747 } ,
- { 29241 , -5891 } ,
- { 29211 , -6034 } ,
- { 29181 , -6178 } ,
- { 29151 , -6321 } ,
- { 29119 , -6464 } ,
- { 29087 , -6607 } ,
- { 29054 , -6749 } ,
- { 29021 , -6892 } ,
- { 28987 , -7034 } ,
- { 28952 , -7177 } ,
- { 28916 , -7319 } ,
- { 28880 , -7460 } ,
- { 28843 , -7602 } ,
- { 28805 , -7744 } ,
- { 28767 , -7885 } ,
- { 28728 , -8026 } ,
- { 28688 , -8167 } ,
- { 28648 , -8308 } ,
- { 28607 , -8448 } ,
- { 28565 , -8589 } ,
- { 28522 , -8729 } ,
- { 28479 , -8869 } ,
- { 28435 , -9008 } ,
- { 28391 , -9148 } ,
- { 28346 , -9287 } ,
- { 28300 , -9426 } ,
- { 28253 , -9565 } ,
- { 28206 , -9703 } ,
- { 28158 , -9842 } ,
- { 28109 , -9980 } ,
- { 28060 , -10118 } ,
- { 28010 , -10255 } ,
- { 27959 , -10393 } ,
- { 27908 , -10530 } ,
- { 27856 , -10667 } ,
- { 27803 , -10803 } ,
- { 27750 , -10940 } ,
- { 27696 , -11076 } ,
- { 27641 , -11212 } ,
- { 27586 , -11347 } ,
- { 27529 , -11482 } ,
- { 27473 , -11617 } ,
- { 27415 , -11752 } ,
- { 27357 , -11886 } ,
- { 27299 , -12021 } ,
- { 27239 , -12154 } ,
- { 27179 , -12288 } ,
- { 27119 , -12421 } ,
- { 27057 , -12554 } ,
- { 26996 , -12687 } ,
- { 26933 , -12819 } ,
- { 26870 , -12951 } ,
- { 26806 , -13083 } ,
- { 26741 , -13215 } ,
- { 26676 , -13346 } ,
- { 26610 , -13476 } ,
- { 26544 , -13607 } ,
- { 26477 , -13737 } ,
- { 26409 , -13867 } ,
- { 26340 , -13996 } ,
- { 26271 , -14125 } ,
- { 26202 , -14254 } ,
- { 26132 , -14383 } ,
- { 26061 , -14511 } ,
- { 25989 , -14638 } ,
- { 25917 , -14766 } ,
- { 25844 , -14893 } ,
- { 25771 , -15020 } ,
- { 25697 , -15146 } ,
- { 25622 , -15272 } ,
- { 25547 , -15397 } ,
- { 25471 , -15523 } ,
- { 25394 , -15648 } ,
- { 25317 , -15772 } ,
- { 25239 , -15896 } ,
- { 25161 , -16020 } ,
- { 25082 , -16143 } ,
- { 25003 , -16266 } ,
- { 24923 , -16389 } ,
- { 24842 , -16511 } ,
- { 24760 , -16632 } ,
- { 24678 , -16754 } ,
- { 24596 , -16875 } ,
- { 24513 , -16995 } ,
- { 24429 , -17115 } ,
- { 24345 , -17235 } ,
- { 24260 , -17354 } ,
- { 24174 , -17473 } ,
- { 24088 , -17592 } ,
- { 24002 , -17710 } ,
- { 23914 , -17827 } ,
- { 23827 , -17945 } ,
- { 23738 , -18061 } ,
- { 23649 , -18178 } ,
- { 23560 , -18293 } ,
- { 23470 , -18409 } ,
- { 23379 , -18524 } ,
- { 23288 , -18638 } ,
- { 23196 , -18752 } ,
- { 23104 , -18866 } ,
- { 23011 , -18979 } ,
- { 22917 , -19092 } ,
- { 22824 , -19204 } ,
- { 22729 , -19316 } ,
- { 22634 , -19427 } ,
- { 22538 , -19538 } ,
- { 22442 , -19649 } ,
- { 22345 , -19759 } ,
- { 22248 , -19868 } ,
- { 22150 , -19977 } ,
- { 22052 , -20086 } ,
- { 21953 , -20194 } ,
- { 21854 , -20301 } ,
- { 21754 , -20408 } ,
- { 21653 , -20515 } ,
- { 21552 , -20621 } ,
- { 21451 , -20726 } ,
- { 21349 , -20831 } ,
- { 21246 , -20936 } ,
- { 21143 , -21040 }
- };
-cos_msin_t a_cos_msin_64[320] = {
-{29827, -34},
-{29827, -106},
-{29827, -177},
-{29827, -249},
-{29826, -320},
-{29825, -392},
-{29824, -463},
-{29823, -535},
-{29821, -606},
-{29819, -678},
-{29818, -750},
-{29816, -821},
-{29814, -893},
-{29812, -964},
-{29809, -1035},
-{29807, -1106},
-{29804, -1177},
-{29801, -1249},
-{29797, -1320},
-{29795, -1392},
-{29791, -1463},
-{29787, -1535},
-{29784, -1606},
-{29780, -1678},
-{29776, -1749},
-{29771, -1820},
-{29767, -1892},
-{29763, -1963},
-{29758, -2035},
-{29753, -2106},
-{29748, -2177},
-{29742, -2249},
-{29737, -2320},
-{29731, -2391},
-{29726, -2462},
-{29719, -2534},
-{29713, -2605},
-{29707, -2676},
-{29701, -2747},
-{29694, -2819},
-{29686, -2890},
-{29680, -2961},
-{29673, -3032},
-{29665, -3103},
-{29658, -3174},
-{29650, -3245},
-{29643, -3316},
-{29635, -3387},
-{29626, -3459},
-{29618, -3529},
-{29610, -3600},
-{29601, -3671},
-{29592, -3742},
-{29583, -3813},
-{29574, -3884},
-{29564, -3955},
-{29554, -4026},
-{29544, -4097},
-{29535, -4167},
-{29525, -4238},
-{29514, -4309},
-{29504, -4380},
-{29493, -4450},
-{29483, -4521},
-{29472, -4591},
-{29461, -4662},
-{29450, -4733},
-{29439, -4803},
-{29427, -4874},
-{29415, -4944},
-{29403, -5015},
-{29391, -5085},
-{29379, -5155},
-{29366, -5226},
-{29353, -5296},
-{29341, -5367},
-{29328, -5438},
-{29314, -5508},
-{29301, -5578},
-{29289, -5648},
-{29274, -5718},
-{29260, -5788},
-{29247, -5858},
-{29232, -5928},
-{29218, -5998},
-{29204, -6068},
-{29188, -6139},
-{29175, -6209},
-{29159, -6279},
-{29145, -6348},
-{29128, -6418},
-{29114, -6488},
-{29097, -6557},
-{29082, -6627},
-{29066, -6697},
-{29050, -6767},
-{29034, -6837},
-{29017, -6906},
-{29001, -6975},
-{28984, -7045},
-{28966, -7114},
-{28950, -7184},
-{28933, -7254},
-{28915, -7323},
-{28897, -7392},
-{28880, -7461},
-{28862, -7530},
-{28843, -7600},
-{28825, -7669},
-{28807, -7738},
-{28788, -7806},
-{28769, -7875},
-{28751, -7944},
-{28732, -8014},
-{28712, -8082},
-{28692, -8151},
-{28672, -8219},
-{28653, -8289},
-{28633, -8357},
-{28613, -8425},
-{28593, -8494},
-{28572, -8563},
-{28551, -8632},
-{28531, -8700},
-{28510, -8768},
-{28488, -8837},
-{28468, -8905},
-{28447, -8973},
-{28425, -9041},
-{28403, -9109},
-{28381, -9177},
-{28359, -9245},
-{28336, -9313},
-{28315, -9381},
-{28292, -9448},
-{28269, -9517},
-{28246, -9584},
-{28223, -9652},
-{28200, -9720},
-{28176, -9787},
-{28153, -9854},
-{28129, -9922},
-{28105, -9990},
-{28082, -10056},
-{28057, -10124},
-{28032, -10191},
-{28009, -10258},
-{27984, -10326},
-{27959, -10392},
-{27934, -10460},
-{27909, -10526},
-{27883, -10593},
-{27858, -10661},
-{27832, -10727},
-{27807, -10794},
-{27780, -10860},
-{27754, -10927},
-{27728, -10993},
-{27701, -11059},
-{27676, -11126},
-{27648, -11192},
-{27622, -11259},
-{27595, -11324},
-{27567, -11391},
-{27540, -11456},
-{27512, -11523},
-{27484, -11588},
-{27456, -11655},
-{27429, -11720},
-{27401, -11786},
-{27372, -11852},
-{27344, -11917},
-{27315, -11982},
-{27286, -12049},
-{27257, -12114},
-{27229, -12179},
-{27199, -12244},
-{27169, -12309},
-{27140, -12375},
-{27110, -12439},
-{27080, -12505},
-{27050, -12570},
-{27019, -12634},
-{26990, -12699},
-{26958, -12764},
-{26928, -12828},
-{26897, -12892},
-{26866, -12956},
-{26835, -13021},
-{26804, -13086},
-{26773, -13149},
-{26741, -13214},
-{26709, -13278},
-{26677, -13342},
-{26645, -13406},
-{26613, -13470},
-{26581, -13534},
-{26549, -13597},
-{26515, -13661},
-{26483, -13725},
-{26450, -13788},
-{26417, -13851},
-{26384, -13915},
-{26350, -13978},
-{26316, -14041},
-{26283, -14103},
-{26248, -14166},
-{26215, -14229},
-{26180, -14292},
-{26146, -14355},
-{26112, -14417},
-{26077, -14480},
-{26042, -14543},
-{26008, -14605},
-{25972, -14667},
-{25937, -14730},
-{25901, -14792},
-{25866, -14854},
-{25830, -14916},
-{25794, -14977},
-{25759, -15039},
-{25723, -15101},
-{25687, -15162},
-{25650, -15224},
-{25613, -15286},
-{25577, -15347},
-{25540, -15408},
-{25503, -15470},
-{25465, -15531},
-{25428, -15592},
-{25391, -15653},
-{25353, -15714},
-{25315, -15774},
-{25277, -15834},
-{25240, -15895},
-{25201, -15956},
-{25162, -16016},
-{25124, -16076},
-{25086, -16136},
-{25047, -16196},
-{25008, -16256},
-{24969, -16316},
-{24930, -16375},
-{24891, -16436},
-{24851, -16496},
-{24811, -16555},
-{24772, -16615},
-{24732, -16674},
-{24692, -16732},
-{24652, -16791},
-{24612, -16852},
-{24572, -16911},
-{24531, -16969},
-{24490, -17027},
-{24449, -17086},
-{24408, -17145},
-{24367, -17203},
-{24325, -17261},
-{24284, -17320},
-{24242, -17379},
-{24200, -17436},
-{24158, -17494},
-{24116, -17552},
-{24075, -17610},
-{24032, -17668},
-{23990, -17725},
-{23947, -17782},
-{23904, -17840},
-{23862, -17897},
-{23819, -17954},
-{23775, -18011},
-{23732, -18068},
-{23689, -18125},
-{23645, -18181},
-{23602, -18238},
-{23558, -18294},
-{23514, -18351},
-{23470, -18407},
-{23426, -18464},
-{23381, -18520},
-{23337, -18576},
-{23293, -18632},
-{23248, -18688},
-{23202, -18743},
-{23158, -18799},
-{23112, -18854},
-{23068, -18910},
-{23022, -18964},
-{22977, -19020},
-{22931, -19074},
-{22885, -19129},
-{22839, -19185},
-{22793, -19239},
-{22747, -19294},
-{22700, -19348},
-{22655, -19403},
-{22607, -19457},
-{22561, -19511},
-{22514, -19565},
-{22467, -19619},
-{22421, -19673},
-{22373, -19726},
-{22326, -19780},
-{22279, -19834},
-{22230, -19887},
-{22183, -19940},
-{22135, -19993},
-{22087, -20047},
-{22039, -20099},
-{21991, -20152},
-{21942, -20205},
-{21894, -20257},
-{21845, -20309},
-{21797, -20362},
-{21748, -20413},
-{21699, -20466},
-{21650, -20518},
-{21601, -20570},
-{21551, -20621},
-{21502, -20674}
-};
-
-cos_msin_t *a_cos_msin_table[] = {a_cos_msin_2, a_cos_msin_4,
- a_cos_msin_8, a_cos_msin_16,
- a_cos_msin_32,a_cos_msin_64
- };
-
-Word16 dct_core_a[10][10] = {
-
-{ 10453, 10196, 9688, 8941, 7973, 6810, 5479, 4013, 2448, 823 },
-{ 10196, 7973, 4013, -823, -5479, -8941, -10453, -9688, -6810, -2448 },
-{ 9688 , 4013, -4013, -9688, -9688, -4013, 4013, 9688, 9688, 4013 },
-{ 8941 , -823, -9688, -7973, 2448, 10196, 6810, -4013, -10453, -5479 },
-{ 7973 , -5479, -9688, 2448, 10453, 823, -10196, -4013, 8941, 6810 },
-{ 6810 , -8941, -4013, 10196, 823, -10453, 2448, 9688, -5479, -7973 },
-{ 5479 , -10453, 4013, 6810, -10196, 2448, 7973, -9688, 823, 8941 },
-{ 4013 , -9688, 9688, -4013, -4013, 9688, -9688, 4013, 4013, -9688 },
-{ 2448 , -6810, 9688, -10453, 8941, -5479, 823, 4013, -7973, 10196 },
-{ 823 , -2448, 4013, -5479, 6810, -7973, 8941, -9688, 10196, -10453 }};
-
-Word16 anal_bias[320] = {
- 1, 1, 3, 1, 4, 1, 3, -2, 4, 3,
- 4, 1, 3, 0, 2, -3, 0, 0, 2, 2,
- 4, 1, 1, -5, 4, 1, 2, -1, 0, -1,
- 1, -2, 0, 2, 2, 2, 4, 1, 3, 0,
- 5, 3, 2, 0, 3, 0, 1, -4, 1, 1,
- 2, 0, 4, 0, 1, -4, 6, 1, 3, -1,
- 1, 0, 0, -4, 1, 1, 3, 1, 3, 2,
- 4, -2, 4, 3, 5, 1, 3, 0, 1, -3,
- 1, 1, 2, 0, 4, 1, 2, -4, 4, 2,
- 2, -1, 1, -1, 1, -4, 0, 0, 3, 0,
- 5, 2, 3, -1, 6, 2, 5, 0, 4, 0,
- 1, -3, 1, 0, 3, 0, 4, 0, 1, -3,
- 4, 1, 3, -1, 1, -2, 1, -4, 0, 1,
- 2, 1, 3, 2, 2, -2, 4, 3, 3, 0,
- 3, 0, 0, -2, 1, 0, 2, 0, 5, -1,
- 1, -3, 4, 2, 2, 0, 2, -3, 1, -4,
- -1, 1, 2, 2, 4, 1, 3, -1, 5, 2,
- 2, 0, 3, -1, 2, -3, 0, 1, 2, 2,
- 4, 0, 1, -5, 5, 1, 3, 0, 2, -1,
- 0, -2, 1, 2, 2, 2, 4, 1, 0, 0,
- 4, 2, 4, 1, 4, -1, 1, -4, 0, 1,
- 3, 1, 5, 1, 1, -2, 4, 0, 2, 0,
- 2, -1, 0, -2, 0, 1, 1, 1, 4, 2,
- 3, -2, 5, 4, 4, 0, 3, 0, 3, -4,
- 1, 2, 2, 0, 4, 1, 0, -3, 4, 2,
- 3, -1, 1, -1, 1, -4, 0, 2, 3, 1,
- 4, 1, 3, 0, 3, 3, 4, 1, 2, 0,
- 1, -3, 2, 2, 2, 1, 5, 0, 1, -4,
- 4, 1, 3, -2, 3, -1, 0, -2, 0, 2,
- 2, 0, 5, 1, 4, -1, 4, 3, 4, 1,
- 3, 0, 1, -4, 2, 0, 3, 1, 5, 0,
- 1, -5, 5, 2, 2, 0, 0, 0, 0, -4};
-
diff --git a/sflphone-common/libs/pjproject/third_party/g7221/encode/encoder.c b/sflphone-common/libs/pjproject/third_party/g7221/encode/encoder.c
deleted file mode 100644
index 2d878cc48ab368fb88bf00da9a4c25360ab3ebcd..0000000000000000000000000000000000000000
--- a/sflphone-common/libs/pjproject/third_party/g7221/encode/encoder.c
+++ /dev/null
@@ -1,1125 +0,0 @@
-/***************************************************************************
-**
-** ITU-T G.722.1 (2005-05) - Fixed point implementation for main body and Annex C
-** > Software Release 2.1 (2008-06)
-** (Simple repackaging; no change from 2005-05 Release 2.0 code)
-**
-** � 2004 Polycom, Inc.
-**
-** All rights reserved.
-**
-***************************************************************************/
-
-/***************************************************************************
- Filename: encoder.c
-
- Purpose: Contains files used to implement the G.722.1 Annex C encoder
-
- Design Notes:
-
-***************************************************************************/
-
-/***************************************************************************
- Include files
-***************************************************************************/
-
-#include <stdio.h>
-#include <math.h>
-#include "defs.h"
-#include "huff_def.h"
-#include "tables.h"
-#include "count.h"
-
-/***************************************************************************
- Function: encoder
-
- Syntax: void encoder(Word16 number_of_available_bits,
- Word16 number_of_regions,
- Word16 mlt_coefs,
- Word16 mag_shift,
- Word16 out_words)
-
- inputs: number_of_available_bits
- number_of_regions
- mag_shift
- mlt_coefs[DCT_LENGTH]
-
- outputs: out_words[MAX_BITS_PER_FRAME/16]
-
-
- Description: Encodes the mlt coefs into out_words using G.722.1 Annex C
-
-
- WMOPS: 7kHz | 24kbit | 32kbit
- -------|--------------|----------------
- AVG | 0.93 | 1.04
- -------|--------------|----------------
- MAX | 1.20 | 1.28
- -------|--------------|----------------
-
- 14kHz | 24kbit | 32kbit | 48kbit
- -------|--------------|----------------|----------------
- AVG | 1.39 | 1.71 | 2.01
- -------|--------------|----------------|----------------
- MAX | 2.00 | 2.30 | 2.52
- -------|--------------|----------------|----------------
-
-***************************************************************************/
-
-void encoder(Word16 number_of_available_bits,
- Word16 number_of_regions,
- Word16 *mlt_coefs,
- Word16 mag_shift,
- Word16 *out_words)
-{
-
- Word16 num_categorization_control_bits;
- Word16 num_categorization_control_possibilities;
- Word16 number_of_bits_per_frame;
- Word16 number_of_envelope_bits;
- Word16 categorization_control;
- Word16 region;
- Word16 absolute_region_power_index[MAX_NUMBER_OF_REGIONS];
- Word16 power_categories[MAX_NUMBER_OF_REGIONS];
- Word16 category_balances[MAX_NUM_CATEGORIZATION_CONTROL_POSSIBILITIES-1];
- Word16 drp_num_bits[MAX_NUMBER_OF_REGIONS+1];
- UWord16 drp_code_bits[MAX_NUMBER_OF_REGIONS+1];
- Word16 region_mlt_bit_counts[MAX_NUMBER_OF_REGIONS];
- UWord32 region_mlt_bits[4*MAX_NUMBER_OF_REGIONS];
- Word16 mag_shift_offset;
-
- Word16 temp;
-
- /* initialize variables */
- test();
- if (number_of_regions == NUMBER_OF_REGIONS)
- {
- num_categorization_control_bits = NUM_CATEGORIZATION_CONTROL_BITS;
- move16();
- num_categorization_control_possibilities = NUM_CATEGORIZATION_CONTROL_POSSIBILITIES;
- move16();
- }
- else
- {
- num_categorization_control_bits = MAX_NUM_CATEGORIZATION_CONTROL_BITS;
- move16();
- num_categorization_control_possibilities = MAX_NUM_CATEGORIZATION_CONTROL_POSSIBILITIES;
- move16();
- }
-
- number_of_bits_per_frame = number_of_available_bits;
- move16();
-
- for (region=0; region<number_of_regions; region++)
- {
- region_mlt_bit_counts[region] = 0;
- move16();
- }
-
- /* Estimate power envelope. */
- number_of_envelope_bits = compute_region_powers(mlt_coefs,
- mag_shift,
- drp_num_bits,
- drp_code_bits,
- absolute_region_power_index,
- number_of_regions);
-
- /* Adjust number of available bits based on power envelope estimate */
- temp = sub(number_of_available_bits,number_of_envelope_bits);
- number_of_available_bits = sub(temp,num_categorization_control_bits);
-
- /* get categorizations */
- categorize(number_of_available_bits,
- number_of_regions,
- num_categorization_control_possibilities,
- absolute_region_power_index,
- power_categories,
- category_balances);
-
- /* Adjust absolute_region_category_index[] for mag_shift.
- This assumes that REGION_POWER_STEPSIZE_DB is defined
- to be exactly 3.010299957 or 20.0 times log base 10
- of square root of 2. */
- temp = shl_nocheck(mag_shift,1);
- mag_shift_offset = add(temp,REGION_POWER_TABLE_NUM_NEGATIVES);
-
- for (region=0; region<number_of_regions; region++)
- {
- absolute_region_power_index[region] = add(absolute_region_power_index[region],mag_shift_offset);
- move16();
- }
-
- /* adjust the absolute power region index based on the mlt coefs */
- adjust_abs_region_power_index(absolute_region_power_index,mlt_coefs,number_of_regions);
-
-
- /* quantize and code the mlt coefficients based on categorizations */
- vector_quantize_mlts(number_of_available_bits,
- number_of_regions,
- num_categorization_control_possibilities,
- mlt_coefs,
- absolute_region_power_index,
- power_categories,
- category_balances,
- &categorization_control,
- region_mlt_bit_counts,
- region_mlt_bits);
-
- /* stuff bits into words */
- bits_to_words(region_mlt_bits,
- region_mlt_bit_counts,
- drp_num_bits,
- drp_code_bits,
- out_words,
- categorization_control,
- number_of_regions,
- num_categorization_control_bits,
- number_of_bits_per_frame);
-
-}
-
-/***************************************************************************
- Function: bits_to_words
-
- Syntax: bits_to_words(UWord32 *region_mlt_bits,
- Word16 *region_mlt_bit_counts,
- Word16 *drp_num_bits,
- UWord16 *drp_code_bits,
- Word16 *out_words,
- Word16 categorization_control,
- Word16 number_of_regions,
- Word16 num_categorization_control_bits,
- Word16 number_of_bits_per_frame)
-
-
- Description: Stuffs the bits into words for output
-
- WMOPS: 7kHz | 24kbit | 32kbit
- -------|--------------|----------------
- AVG | 0.09 | 0.12
- -------|--------------|----------------
- MAX | 0.10 | 0.13
- -------|--------------|----------------
-
- 14kHz | 24kbit | 32kbit | 48kbit
- -------|--------------|----------------|----------------
- AVG | 0.12 | 0.15 | 0.19
- -------|--------------|----------------|----------------
- MAX | 0.14 | 0.17 | 0.21
- -------|--------------|----------------|----------------
-
-***************************************************************************/
-void bits_to_words(UWord32 *region_mlt_bits,
- Word16 *region_mlt_bit_counts,
- Word16 *drp_num_bits,
- UWord16 *drp_code_bits,
- Word16 *out_words,
- Word16 categorization_control,
- Word16 number_of_regions,
- Word16 num_categorization_control_bits,
- Word16 number_of_bits_per_frame)
-{
- Word16 out_word_index = 0;
- Word16 j;
- Word16 region;
- Word16 out_word;
- Word16 region_bit_count;
- Word16 current_word_bits_left;
- UWord16 slice;
- Word16 out_word_bits_free = 16;
- UWord32 *in_word_ptr;
- UWord32 current_word;
-
- Word32 acca = 0;
- Word32 accb;
- Word16 temp;
-
- /* First set up the categorization control bits to look like one more set of region power bits. */
- out_word = 0;
- move16();
-
- drp_num_bits[number_of_regions] = num_categorization_control_bits;
- move16();
-
- drp_code_bits[number_of_regions] = (UWord16)categorization_control;
- move16();
-
- /* These code bits are right justified. */
- for (region=0; region <= number_of_regions; region++)
- {
- current_word_bits_left = drp_num_bits[region];
- move16();
-
- current_word = (UWord32)drp_code_bits[region];
- move16();
-
- j = sub(current_word_bits_left,out_word_bits_free);
-
- test();
- if (j >= 0)
- {
- temp = extract_l(L_shr_nocheck(current_word,j));
- out_word = add(out_word,temp);
-
- out_words[out_word_index++] = out_word;
- move16();
-
- out_word_bits_free = 16;
- move16();
-
- out_word_bits_free = sub(out_word_bits_free,j);
-
- acca = (current_word << out_word_bits_free);
- out_word = extract_l(acca);
- }
- else
- {
- j = negate(j);
-
- acca = (current_word << j);
- accb = L_deposit_l(out_word);
- acca = L_add(accb,acca);
- out_word = extract_l(acca);
-
- out_word_bits_free = sub(out_word_bits_free,current_word_bits_left);
- }
- }
-
- /* These code bits are left justified. */
-
- for (region=0;region<number_of_regions; region++)
- {
- accb = L_deposit_l(out_word_index);
- accb = L_shl_nocheck(accb,4);
- accb = L_sub(accb,number_of_bits_per_frame);
- test();
- if(accb < 0)
- {
- temp = shl_nocheck(region,2);
- in_word_ptr = ®ion_mlt_bits[temp];
- region_bit_count = region_mlt_bit_counts[region];
- move16();
-
- temp = sub(32,region_bit_count);
- test();
- if(temp > 0)
- current_word_bits_left = region_bit_count;
- else
- current_word_bits_left = 32;
-
- current_word = *in_word_ptr++;
-
- acca = L_deposit_l(out_word_index);
- acca = L_shl_nocheck(acca,4);
- acca = L_sub(acca,number_of_bits_per_frame);
-
- /* from while loop */
- test();
- test();
- logic16();
- while ((region_bit_count > 0) && (acca < 0))
- {
- /* from while loop */
- test();
- test();
- logic16();
-
- temp = sub(current_word_bits_left,out_word_bits_free);
- test();
- if (temp >= 0)
- {
- temp = sub(32,out_word_bits_free);
- accb = LU_shr(current_word,temp);
- slice = (UWord16)extract_l(accb);
-
- out_word = add(out_word,slice);
-
- test();
- current_word <<= out_word_bits_free;
-
- current_word_bits_left = sub(current_word_bits_left,out_word_bits_free);
- out_words[out_word_index++] = extract_l(out_word);
- move16();
-
- out_word = 0;
- move16();
-
- out_word_bits_free = 16;
- move16();
- }
- else
- {
- temp = sub(32,current_word_bits_left);
- accb = LU_shr(current_word,temp);
- slice = (UWord16)extract_l(accb);
-
- temp = sub(out_word_bits_free,current_word_bits_left);
- test();
- accb = slice << temp;
- acca = L_deposit_l(out_word);
- acca = L_add(acca,accb);
- out_word = extract_l(acca);
- out_word_bits_free = sub(out_word_bits_free,current_word_bits_left);
-
- current_word_bits_left = 0;
- move16();
- }
-
- test();
- if (current_word_bits_left == 0)
- {
- current_word = *in_word_ptr++;
- region_bit_count = sub(region_bit_count,32);
-
- /* current_word_bits_left = MIN(32,region_bit_count); */
- temp = sub(32,region_bit_count);
- test();
- if(temp > 0)
- current_word_bits_left = region_bit_count;
- else
- current_word_bits_left = 32;
-
- }
- acca = L_deposit_l(out_word_index);
- acca = L_shl_nocheck(acca,4);
- acca = L_sub(acca,number_of_bits_per_frame);
- }
- accb = L_deposit_l(out_word_index);
- accb = L_shl_nocheck(accb,4);
- accb = L_sub(accb,number_of_bits_per_frame);
- }
- }
-
- /* Fill out with 1's. */
-
- test();
- while (acca < 0)
- {
- test();
- current_word = 0x0000ffff;
- move32();
-
- temp = sub(16,out_word_bits_free);
- acca = LU_shr(current_word,temp);
- slice = (UWord16)extract_l(acca);
-
- out_word = add(out_word,slice);
- out_words[out_word_index++] = out_word;
- move16();
-
- out_word = 0;
- move16();
-
- out_word_bits_free = 16;
- move16();
-
- acca = L_deposit_l(out_word_index);
- acca = L_shl_nocheck(acca,4);
- acca = L_sub(acca,number_of_bits_per_frame);
- }
-}
-/***************************************************************************
- Function: adjust_abs_region_power_index
-
- Syntax: adjust_abs_region_power_index(Word16 *absolute_region_power_index,
- Word16 *mlt_coefs,
- Word16 number_of_regions)
-
- inputs: *mlt_coefs
- *absolute_region_power_index
- number_of_regions
-
- outputs: *absolute_region_power_index
-
- Description: Adjusts the absolute power index
-
-
- WMOPS: 7kHz | 24kbit | 32kbit
- -------|--------------|----------------
- AVG | 0.03 | 0.03
- -------|--------------|----------------
- MAX | 0.12 | 0.12
- -------|--------------|----------------
-
- 14kHz | 24kbit | 32kbit | 48kbit
- -------|--------------|----------------|----------------
- AVG | 0.03 | 0.03 | 0.03
- -------|--------------|----------------|----------------
- MAX | 0.14 | 0.14 | 0.14
- -------|--------------|----------------|----------------
-
-***************************************************************************/
-void adjust_abs_region_power_index(Word16 *absolute_region_power_index,Word16 *mlt_coefs,Word16 number_of_regions)
-{
- Word16 n,i;
- Word16 region;
- Word16 *raw_mlt_ptr;
-
- Word32 acca;
- Word16 temp;
-
- for (region=0; region<number_of_regions; region++)
- {
- n = sub(absolute_region_power_index[region],39);
- n = shr_nocheck(n,1);
-
- test();
- if (n > 0)
- {
- temp = extract_l(L_mult0(region,REGION_SIZE));
-
- raw_mlt_ptr = &mlt_coefs[temp];
-
- for (i=0; i<REGION_SIZE; i++)
- {
- acca = L_shl_nocheck(*raw_mlt_ptr,16);
- acca = L_add(acca,32768L);
- acca = L_shr_nocheck(acca,n);
- acca = L_shr_nocheck(acca,16);
- *raw_mlt_ptr++ = extract_l(acca);
- }
-
- temp = shl_nocheck(n,1);
- temp = sub(absolute_region_power_index[region],temp);
- absolute_region_power_index[region] = temp;
- move16();
- }
- }
-}
-
-/***************************************************************************
- Function: compute_region_powers
-
- Syntax: Word16 compute_region_powers(Word16 *mlt_coefs,
- Word16 mag_shift,
- Word16 *drp_num_bits,
- UWord16 *drp_code_bits,
- Word16 *absolute_region_power_index,
- Word16 number_of_regions)
- mlt_coefs[DCT_LENGTH];
- mag_shift;
- drp_num_bits[MAX_NUMBER_OF_REGIONS];
- drp_code_bits[MAX_NUMBER_OF_REGIONS];
- absolute_region_power_index[MAX_NUMBER_OF_REGIONS];
- number_of_regions;
-
- Description: Computes the power for each of the regions
-
-
- WMOPS: 7kHz | 24kbit | 32kbit
- -------|--------------|----------------
- AVG | 0.09 | 0.09
- -------|--------------|----------------
- MAX | 0.13 | 0.13
- -------|--------------|----------------
-
- 14kHz | 24kbit | 32kbit | 48kbit
- -------|--------------|----------------|----------------
- AVG | 0.20 | 0.20 | 0.20
- -------|--------------|----------------|----------------
- MAX | 0.29 | 0.29 | 0.29
- -------|--------------|----------------|----------------
-
-***************************************************************************/
-
-Word16 compute_region_powers(Word16 *mlt_coefs,
- Word16 mag_shift,
- Word16 *drp_num_bits,
- UWord16 *drp_code_bits,
- Word16 *absolute_region_power_index,
- Word16 number_of_regions)
-{
-
- Word16 *input_ptr;
- Word32 long_accumulator;
- Word16 itemp1;
- Word16 power_shift;
- Word16 region;
- Word16 j;
- Word16 differential_region_power_index[MAX_NUMBER_OF_REGIONS];
- Word16 number_of_bits;
-
- Word32 acca;
- Word16 temp;
- Word16 temp1;
- Word16 temp2;
-
-
- input_ptr = mlt_coefs;
- for (region=0; region<number_of_regions; region++)
- {
- long_accumulator = L_deposit_l(0);
-
- for (j=0; j<REGION_SIZE; j++)
- {
- itemp1 = *input_ptr++;
- move16();
- long_accumulator = L_mac0(long_accumulator,itemp1,itemp1);
- }
-
- power_shift = 0;
- move16();
-
- acca = (long_accumulator & 0x7fff0000L);
- logic32();
-
- test();
- while (acca > 0)
- {
- test();
- long_accumulator = L_shr_nocheck(long_accumulator,1);
-
- acca = (long_accumulator & 0x7fff0000L);
- logic32();
-
- power_shift = add(power_shift,1);
- }
-
- acca = L_sub(long_accumulator,32767);
-
- temp = add(power_shift,15);
- test();
- test();
- logic16();
- while ((acca <= 0) && (temp >= 0))
- {
- test();
- test();
- logic16();
-
- long_accumulator = L_shl_nocheck(long_accumulator,1);
- acca = L_sub(long_accumulator,32767);
- power_shift--;
- temp = add(power_shift,15);
- }
- long_accumulator = L_shr_nocheck(long_accumulator,1);
- /* 28963 corresponds to square root of 2 times REGION_SIZE(20). */
- acca = L_sub(long_accumulator,28963);
-
- test();
- if (acca >= 0)
- power_shift = add(power_shift,1);
-
- acca = L_deposit_l(mag_shift);
- acca = L_shl_nocheck(acca,1);
- acca = L_sub(power_shift,acca);
- acca = L_add(35,acca);
- acca = L_sub(acca,REGION_POWER_TABLE_NUM_NEGATIVES);
- absolute_region_power_index[region] = extract_l(acca);
- }
-
-
- /* Before we differentially encode the quantized region powers, adjust upward the
- valleys to make sure all the peaks can be accurately represented. */
- temp = sub(number_of_regions,2);
-
- for (region = temp; region >= 0; region--)
- {
- temp1 = sub(absolute_region_power_index[region+1],DRP_DIFF_MAX);
- temp2 = sub(absolute_region_power_index[region],temp1);
- test();
- if (temp2 < 0)
- {
- absolute_region_power_index[region] = temp1;
- move16();
- }
- }
-
- /* The MLT is currently scaled too low by the factor
- ENCODER_SCALE_FACTOR(=18318)/32768 * (1./sqrt(160).
- This is the ninth power of 1 over the square root of 2.
- So later we will add ESF_ADJUSTMENT_TO_RMS_INDEX (now 9)
- to drp_code_bits[0]. */
-
- /* drp_code_bits[0] can range from 1 to 31. 0 will be used only as an escape sequence. */
- temp1 = sub(1,ESF_ADJUSTMENT_TO_RMS_INDEX);
- temp2 = sub(absolute_region_power_index[0],temp1);
- test();
- if (temp2 < 0)
- {
- absolute_region_power_index[0] = temp1;
- move16();
- }
-
- temp1 = sub(31,ESF_ADJUSTMENT_TO_RMS_INDEX);
-
- /*
- * The next line was corrected in Release 1.2
- */
-
- temp2 = sub(absolute_region_power_index[0], temp1);
- test();
- if (temp2 > 0)
- {
- absolute_region_power_index[0] = temp1;
- move16();
- }
-
- differential_region_power_index[0] = absolute_region_power_index[0];
- move16();
-
- number_of_bits = 5;
- move16();
-
- drp_num_bits[0] = 5;
- move16();
-
- drp_code_bits[0] = (UWord16)add(absolute_region_power_index[0],ESF_ADJUSTMENT_TO_RMS_INDEX);
- move16();
-
- /* Lower limit the absolute region power indices to -8 and upper limit them to 31. Such extremes
- may be mathematically impossible anyway.*/
- for (region=1; region<number_of_regions; region++)
- {
- temp1 = sub(-8,ESF_ADJUSTMENT_TO_RMS_INDEX);
- temp2 = sub(absolute_region_power_index[region],temp1);
- test();
- if (temp2 < 0)
- {
- absolute_region_power_index[region] = temp1;
- move16();
- }
-
- temp1 = sub(31,ESF_ADJUSTMENT_TO_RMS_INDEX);
- temp2 = sub(absolute_region_power_index[region],temp1);
- test();
- if (temp2 > 0)
- {
- absolute_region_power_index[region] = temp1;
- move16();
- }
- }
-
- for (region=1; region<number_of_regions; region++)
- {
- j = sub(absolute_region_power_index[region],absolute_region_power_index[region-1]);
- temp = sub(j,DRP_DIFF_MIN);
- test();
- if (temp < 0)
- {
- j = DRP_DIFF_MIN;
- }
- j = sub(j,DRP_DIFF_MIN);
- move16();
- differential_region_power_index[region] = j;
- move16();
-
- temp = add(absolute_region_power_index[region-1],differential_region_power_index[region]);
- temp = add(temp,DRP_DIFF_MIN);
- absolute_region_power_index[region] = temp;
- move16();
-
- number_of_bits = add(number_of_bits,differential_region_power_bits[region][j]);
- drp_num_bits[region] = differential_region_power_bits[region][j];
- move16();
- drp_code_bits[region] = differential_region_power_codes[region][j];
- move16();
- }
-
- return (number_of_bits);
-}
-
-/***************************************************************************
- Function: vector_quantize_mlts
-
- Syntax: void vector_quantize_mlts(number_of_available_bits,
- number_of_regions,
- num_categorization_control_possibilities,
- mlt_coefs,
- absolute_region_power_index,
- power_categories,
- category_balances,
- p_categorization_control,
- region_mlt_bit_counts,
- region_mlt_bits)
-
- Word16 number_of_available_bits;
- Word16 number_of_regions;
- Word16 num_categorization_control_possibilities;
- Word16 mlt_coefs[DCT_LENGTH];
- Word16 absolute_region_power_index[MAX_NUMBER_OF_REGIONS];
- Word16 power_categories[MAX_NUMBER_OF_REGIONS];
- Word16 category_balances[MAX_NUM_CATEGORIZATION_CONTROL_POSSIBILITIES-1];
- Word16 *p_categorization_control;
- Word16 region_mlt_bit_counts[MAX_NUMBER_OF_REGIONS];
- Word32 region_mlt_bits[4*MAX_NUMBER_OF_REGIONS];
-
- Description: Scalar quantized vector Huffman coding (SQVH)
-
-
- WMOPS: 7kHz | 24kbit | 32kbit
- -------|--------------|----------------
- AVG | 0.57 | 0.65
- -------|--------------|----------------
- MAX | 0.78 | 0.83
- -------|--------------|----------------
-
- 14kHz | 24kbit | 32kbit | 48kbit
- -------|--------------|----------------|----------------
- AVG | 0.62 | 0.90 | 1.11
- -------|--------------|----------------|----------------
- MAX | 1.16 | 1.39 | 1.54
- -------|--------------|----------------|----------------
-
-***************************************************************************/
-
-void vector_quantize_mlts(Word16 number_of_available_bits,
- Word16 number_of_regions,
- Word16 num_categorization_control_possibilities,
- Word16 *mlt_coefs,
- Word16 *absolute_region_power_index,
- Word16 *power_categories,
- Word16 *category_balances,
- Word16 *p_categorization_control,
- Word16 *region_mlt_bit_counts,
- UWord32 *region_mlt_bits)
-{
-
- Word16 *raw_mlt_ptr;
- Word16 region;
- Word16 category;
- Word16 total_mlt_bits = 0;
-
- Word16 temp;
- Word16 temp1;
- Word16 temp2;
-
- /* Start in the middle of the categorization control range. */
- temp = shr_nocheck(num_categorization_control_possibilities,1);
- temp = sub(temp,1);
- for (*p_categorization_control = 0; *p_categorization_control < temp; (*p_categorization_control)++)
- {
- region = category_balances[*p_categorization_control];
- move16();
- power_categories[region] = add(power_categories[region],1);
- move16();
- }
-
- for (region=0; region<number_of_regions; region++)
- {
- category = power_categories[region];
- move16();
- temp = extract_l(L_mult0(region,REGION_SIZE));
- raw_mlt_ptr = &mlt_coefs[temp];
- move16();
- temp = sub(category,(NUM_CATEGORIES-1));
- test();
- if (temp < 0)
- {
- region_mlt_bit_counts[region] =
- vector_huffman(category, absolute_region_power_index[region],raw_mlt_ptr,
- ®ion_mlt_bits[shl_nocheck(region,2)]);
- }
- else
- {
- region_mlt_bit_counts[region] = 0;
- move16();
- }
- total_mlt_bits = add(total_mlt_bits,region_mlt_bit_counts[region]);
- }
-
-
- /* If too few bits... */
- temp = sub(total_mlt_bits,number_of_available_bits);
- test();
- test();
- logic16();
- while ((temp < 0) && (*p_categorization_control > 0))
- {
- test();
- test();
- logic16();
- (*p_categorization_control)--;
- region = category_balances[*p_categorization_control];
- move16();
-
- power_categories[region] = sub(power_categories[region],1);
- move16();
-
- total_mlt_bits = sub(total_mlt_bits,region_mlt_bit_counts[region]);
- category = power_categories[region];
- move16();
-
- raw_mlt_ptr = &mlt_coefs[region*REGION_SIZE];
- move16();
-
- temp = sub(category,(NUM_CATEGORIES-1));
- test();
- if (temp < 0)
- {
- region_mlt_bit_counts[region] =
- vector_huffman(category, absolute_region_power_index[region],raw_mlt_ptr,
- ®ion_mlt_bits[shl_nocheck(region,2)]);
- }
- else
- {
- region_mlt_bit_counts[region] = 0;
- move16();
- }
- total_mlt_bits = add(total_mlt_bits,region_mlt_bit_counts[region]);
- temp = sub(total_mlt_bits,number_of_available_bits);
- }
-
- /* If too many bits... */
- /* Set up for while loop test */
- temp1 = sub(total_mlt_bits,number_of_available_bits);
- temp2 = sub(*p_categorization_control,sub(num_categorization_control_possibilities,1));
- test();
- test();
- logic16();
-
- while ((temp1 > 0) && (temp2 < 0))
- {
- /* operations for while contitions */
- test();
- test();
- logic16();
-
- region = category_balances[*p_categorization_control];
- move16();
-
- power_categories[region] = add(power_categories[region],1);
- move16();
-
- total_mlt_bits = sub(total_mlt_bits,region_mlt_bit_counts[region]);
- category = power_categories[region];
- move16();
-
- temp = extract_l(L_mult0(region,REGION_SIZE));
- raw_mlt_ptr = &mlt_coefs[temp];
- move16();
-
- temp = sub(category,(NUM_CATEGORIES-1));
- test();
- if (temp < 0)
- {
- region_mlt_bit_counts[region] =
- vector_huffman(category, absolute_region_power_index[region],raw_mlt_ptr,
- ®ion_mlt_bits[shl_nocheck(region,2)]);
- }
- else
- {
- region_mlt_bit_counts[region] = 0;
- move16();
- }
- total_mlt_bits = add(total_mlt_bits,region_mlt_bit_counts[region]);
- (*p_categorization_control)++;
-
- temp1 = sub(total_mlt_bits,number_of_available_bits);
- temp2 = sub(*p_categorization_control,sub(num_categorization_control_possibilities,1));
- }
-}
-
-/***************************************************************************
- Function: vector_huffman
-
- Syntax: Word16 vector_huffman(Word16 category,
- Word16 power_index,
- Word16 *raw_mlt_ptr,
- UWord32 *word_ptr)
-
- inputs: Word16 category
- Word16 power_index
- Word16 *raw_mlt_ptr
-
- outputs: number_of_region_bits
- *word_ptr
-
-
- Description: Huffman encoding for each region based on category and power_index
-
- WMOPS: 7kHz | 24kbit | 32kbit
- -------|--------------|----------------
- AVG | 0.03 | 0.03
- -------|--------------|----------------
- MAX | 0.04 | 0.04
- -------|--------------|----------------
-
- 14kHz | 24kbit | 32kbit | 48kbit
- -------|--------------|----------------|----------------
- AVG | 0.03 | 0.03 | 0.03
- -------|--------------|----------------|----------------
- MAX | 0.04 | 0.04 | 0.04
- -------|--------------|----------------|----------------
-
-***************************************************************************/
-Word16 vector_huffman(Word16 category,
- Word16 power_index,
- Word16 *raw_mlt_ptr,
- UWord32 *word_ptr)
-{
-
-
- Word16 inv_of_step_size_times_std_dev;
- Word16 j,n;
- Word16 k;
- Word16 number_of_region_bits;
- Word16 number_of_non_zero;
- Word16 vec_dim;
- Word16 num_vecs;
- Word16 kmax, kmax_plus_one;
- Word16 index,signs_index;
- Word16 *bitcount_table_ptr;
- UWord16 *code_table_ptr;
- Word32 code_bits;
- Word16 number_of_code_bits;
- UWord32 current_word;
- Word16 current_word_bits_free;
-
- Word32 acca;
- Word32 accb;
- Word16 temp;
-
- Word16 mytemp; /* new variable in Release 1.2 */
- Word16 myacca; /* new variable in Release 1.2 */
-
-
- /* initialize variables */
- vec_dim = vector_dimension[category];
- move16();
-
- num_vecs = number_of_vectors[category];
- move16();
-
- kmax = max_bin[category];
- move16();
-
- kmax_plus_one = add(kmax,1);
- move16();
-
- current_word = 0L;
- move16();
-
- current_word_bits_free = 32;
- move16();
-
- number_of_region_bits = 0;
- move16();
-
- /* set up table pointers */
- bitcount_table_ptr = (Word16 *)table_of_bitcount_tables[category];
- code_table_ptr = (UWord16 *) table_of_code_tables[category];
-
- /* compute inverse of step size * standard deviation */
- acca = L_mult(step_size_inverse_table[category],standard_deviation_inverse_table[power_index]);
- acca = L_shr_nocheck(acca,1);
- acca = L_add(acca,4096);
- acca = L_shr_nocheck(acca,13);
-
- /*
- * The next two lines are new to Release 1.2
- */
-
- mytemp = (Word16)(acca & 0x3);
- acca = L_shr_nocheck(acca,2);
-
- inv_of_step_size_times_std_dev = extract_l(acca);
-
-
- for (n=0; n<num_vecs; n++)
- {
- index = 0;
- move16();
-
- signs_index = 0;
- move16();
-
- number_of_non_zero = 0;
- move16();
-
- for (j=0; j<vec_dim; j++)
- {
- k = abs_s(*raw_mlt_ptr);
-
- acca = L_mult(k,inv_of_step_size_times_std_dev);
- acca = L_shr_nocheck(acca,1);
-
- /*
- * The next four lines are new to Release 1.2
- */
-
- myacca = (Word16)L_mult(k,mytemp);
- myacca = (Word16)L_shr_nocheck(myacca,1);
- myacca = (Word16)L_add(myacca,int_dead_zone_low_bits[category]);
- myacca = (Word16)L_shr_nocheck(myacca,2);
-
- acca = L_add(acca,int_dead_zone[category]);
-
- /*
- * The next two lines are new to Release 1.2
- */
-
- acca = L_add(acca,myacca);
- acca = L_shr_nocheck(acca,13);
-
- k = extract_l(acca);
-
- test();
- if (k != 0)
- {
- number_of_non_zero = add(number_of_non_zero,1);
- signs_index = shl_nocheck(signs_index,1);
-
- test();
- if (*raw_mlt_ptr > 0)
- {
- signs_index = add(signs_index,1);
- }
-
- temp = sub(k,kmax);
- test();
- if (temp > 0)
- {
- k = kmax;
- move16();
- }
- }
- acca = L_shr_nocheck(L_mult(index,(kmax_plus_one)),1);
- index = extract_l(acca);
- index = add(index,k);
- raw_mlt_ptr++;
- }
-
- code_bits = *(code_table_ptr+index);
- number_of_code_bits = add((*(bitcount_table_ptr+index)),number_of_non_zero);
- number_of_region_bits = add(number_of_region_bits,number_of_code_bits);
-
- acca = code_bits << number_of_non_zero;
- accb = L_deposit_l(signs_index);
- acca = L_add(acca,accb);
- code_bits = acca;
- move32();
-
- /* msb of codebits is transmitted first. */
- j = sub(current_word_bits_free,number_of_code_bits);
- test();
- if (j >= 0)
- {
- test();
- acca = code_bits << j;
- current_word = L_add(current_word,acca);
- current_word_bits_free = j;
- move16();
- }
- else
- {
- j = negate(j);
- acca = L_shr_nocheck(code_bits,j);
- current_word = L_add(current_word,acca);
-
- *word_ptr++ = current_word;
- move16();
-
- current_word_bits_free = sub(32,j);
- test();
- current_word = code_bits << current_word_bits_free;
- }
- }
-
- *word_ptr++ = current_word;
- move16();
-
- return (number_of_region_bits);
-}
-
-
diff --git a/sflphone-common/libs/pjproject/third_party/g7221/encode/sam2coef.c b/sflphone-common/libs/pjproject/third_party/g7221/encode/sam2coef.c
deleted file mode 100644
index 3dd5b7666038b4d0f201c48cf3637ac5856946e2..0000000000000000000000000000000000000000
--- a/sflphone-common/libs/pjproject/third_party/g7221/encode/sam2coef.c
+++ /dev/null
@@ -1,271 +0,0 @@
-/******************************************************************************
-**
-** ITU-T G.722.1 (2005-05) - Fixed point implementation for main body and Annex C
-** > Software Release 2.1 (2008-06)
-** (Simple repackaging; no change from 2005-05 Release 2.0 code)
-**
-** � 2004 Polycom, Inc.
-**
-** All rights reserved.
-**
-******************************************************************************/
-
-/******************************************************************************
-* Filename: samples_to_rmlt_coefs.c
-*
-* Purpose: Convert Samples to Reversed MLT (Modulated Lapped Transform)
-* Coefficients
-*
-* The "Reversed MLT" is an overlapped block transform which uses
-* even symmetry * on the left, odd symmetry on the right and a
-* Type IV DCT as the block transform. * It is thus similar to a
-* MLT which uses odd symmetry on the left, even symmetry * on the
-* right and a Type IV DST as the block transform. In fact, it is
-* equivalent * to reversing the order of the samples, performing
-* an MLT and then negating all * the even-numbered coefficients.
-*
-******************************************************************************/
-
-/***************************************************************************
- Include files
-***************************************************************************/
-#include "defs.h"
-#include "tables.h"
-#include "count.h"
-
-/***************************************************************************
- Function: samples_to_rmlt_coefs
-
- Syntax: Word16 samples_to_rmlt_coefs(new_samples,
- old_samples,
- coefs,
- dct_length)
- Word16 *new_samples;
- Word16 *old_samples;
- Word16 *coefs;
- Word16 dct_length;
-
- Description: Convert samples to MLT coefficients
-
- Design Notes:
-
- WMOPS: 7kHz | 24kbit | 32kbit
- -------|--------------|----------------
- AVG | 1.40 | 1.40
- -------|--------------|----------------
- MAX | 1.40 | 1.40
- -------|--------------|----------------
-
- 14kHz | 24kbit | 32kbit | 48kbit
- -------|--------------|----------------|----------------
- AVG | 3.07 | 3.07 | 3.07
- -------|--------------|----------------|----------------
- MAX | 3.10 | 3.10 | 3.10
- -------|--------------|----------------|----------------
-
-***************************************************************************/
-
-Word16 samples_to_rmlt_coefs(const Word16 *new_samples,Word16 *old_samples,Word16 *coefs,Word16 dct_length)
-{
-
- Word16 index, vals_left,mag_shift,n;
- Word16 windowed_data[MAX_DCT_LENGTH];
- Word16 *old_ptr;
- const Word16 *new_ptr, *sam_low, *sam_high;
- Word16 *win_low, *win_high;
- Word16 *dst_ptr;
- Word16 neg_win_low;
- Word16 samp_high;
- Word16 half_dct_size;
-
- Word32 acca;
- Word32 accb;
- Word16 temp;
- Word16 temp1;
- Word16 temp2;
- Word16 temp5;
-
- half_dct_size = shr_nocheck(dct_length,1);
-
- /*++++++++++++++++++++++++++++++++++++++++++++*/
- /* Get the first half of the windowed samples */
- /*++++++++++++++++++++++++++++++++++++++++++++*/
-
- dst_ptr = windowed_data;
- move16();
-
- /* address arithmetic */
- test();
- if (dct_length==DCT_LENGTH)
- {
- win_high = samples_to_rmlt_window + half_dct_size;
- }
- else
- {
- win_high = max_samples_to_rmlt_window + half_dct_size;
- }
-
- win_low = win_high;
- move16();
-
- /* address arithmetic */
- sam_high = old_samples + half_dct_size;
-
- sam_low = sam_high;
- move16();
-
- for (vals_left = half_dct_size;vals_left > 0;vals_left--)
- {
- acca = 0L;
- move32();
-
- acca = L_mac(acca,*--win_low, *--sam_low);
- acca = L_mac(acca,*win_high++, *sam_high++);
- temp = itu_round(acca);
-
- *dst_ptr++ = temp;
- move16();
- }
-
- /*+++++++++++++++++++++++++++++++++++++++++++++*/
- /* Get the second half of the windowed samples */
- /*+++++++++++++++++++++++++++++++++++++++++++++*/
-
- sam_low = new_samples;
- move16();
-
- /* address arithmetic */
- sam_high = new_samples + dct_length;
-
- for (vals_left = half_dct_size; vals_left > 0; vals_left--)
- {
- acca = 0L;
- move32();
-
- acca = L_mac(acca,*--win_high, *sam_low++);
- neg_win_low = negate(*win_low++);
- samp_high = *--sam_high;
- acca = L_mac(acca, neg_win_low, samp_high);
- temp = itu_round(acca);
-
- *dst_ptr++=temp;
- move16();
- }
-
- /*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
- /* Save the new samples for next time, when they will be the old samples */
- /*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-
- new_ptr = new_samples;
- move16();
-
- old_ptr = old_samples;
- move16();
-
- for (vals_left = dct_length;vals_left > 0;vals_left--)
- {
- *old_ptr++ = *new_ptr++;
- move16();
- }
-
- /*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
- /* Calculate how many bits to shift up the input to the DCT. */
- /*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-
- temp1=0;
- move16();
-
- for(index=0;index<dct_length;index++)
- {
- temp2 = abs_s(windowed_data[index]);
- temp = sub(temp2,temp1);
- test();
- if(temp > 0)
- {
- move16();
- temp1 = temp2;
- }
- }
-
- mag_shift=0;
- move16();
-
- temp = sub(temp1,14000);
- test();
- if (temp >= 0)
- {
- mag_shift = 0;
- move16();
- }
- else
- {
- temp = sub(temp1,438);
- test();
- if(temp < 0)
- temp = add(temp1,1);
- else
- {
- temp = temp1;
- move16();
- }
- accb = L_mult(temp,9587);
- acca = L_shr_nocheck(accb,20);
- temp5 = extract_l(acca);
- temp = norm_s(temp5);
- test();
- if (temp == 0)
- {
- mag_shift = 9;
- move16();
- }
- else
- mag_shift = sub(temp,6);
-
- }
-
- acca = 0L;
- move32();
- for(index=0; index<dct_length; index++)
- {
- temp = abs_s( windowed_data[index]);
- acca = L_add(acca,temp);
- }
-
- acca = L_shr_nocheck(acca,7);
-
- test();
- if (temp1 < acca)
- {
- mag_shift = sub(mag_shift,1);
- }
-
- test();
- if (mag_shift > 0)
- {
- for(index=0;index<dct_length;index++)
- {
- windowed_data[index] = shl_nocheck(windowed_data[index],mag_shift);
- }
- }
- else
- {
- test();
- if (mag_shift < 0)
- {
- n = negate(mag_shift);
- for(index=0;index<dct_length;index++)
- {
- windowed_data[index] = shr_nocheck(windowed_data[index],n);
- move16();
- }
- }
- }
-
- /*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
- /* Perform a Type IV DCT on the windowed data to get the coefficients */
- /*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-
- dct_type_iv_a(windowed_data, coefs, dct_length);
-
- return(mag_shift);
-}
diff --git a/sflphone-common/libs/pjproject/third_party/mp3/BladeMP3EncDLL.h b/sflphone-common/libs/pjproject/third_party/mp3/BladeMP3EncDLL.h
deleted file mode 100644
index 2e32b913a9d08b44eee1b138b3fcb8d103c196c6..0000000000000000000000000000000000000000
--- a/sflphone-common/libs/pjproject/third_party/mp3/BladeMP3EncDLL.h
+++ /dev/null
@@ -1,283 +0,0 @@
-/*
- * Blade Type of DLL Interface for Lame encoder
- *
- * Copyright (c) 1999-2002 A.L. Faber
- * Based on bladedll.h version 1.0 written by Jukka Poikolainen
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-//#define _BLADEDLL 1
-
-#ifndef ___BLADEDLL_H_INCLUDED___
-#define ___BLADEDLL_H_INCLUDED___
-
-#ifdef __GNUC__
-//#define ATTRIBUTE_PACKED __attribute__((packed))
-#define ATTRIBUTE_PACKED
-#else
-#define ATTRIBUTE_PACKED
-#pragma pack(push)
-#pragma pack(1)
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* encoding formats */
-
-#define BE_CONFIG_MP3 0
-#define BE_CONFIG_LAME 256
-
-/* type definitions */
-
-typedef unsigned long HBE_STREAM;
-typedef HBE_STREAM *PHBE_STREAM;
-typedef unsigned long BE_ERR;
-
-/* error codes */
-
-#define BE_ERR_SUCCESSFUL 0x00000000
-#define BE_ERR_INVALID_FORMAT 0x00000001
-#define BE_ERR_INVALID_FORMAT_PARAMETERS 0x00000002
-#define BE_ERR_NO_MORE_HANDLES 0x00000003
-#define BE_ERR_INVALID_HANDLE 0x00000004
-#define BE_ERR_BUFFER_TOO_SMALL 0x00000005
-
-/* other constants */
-
-#define BE_MAX_HOMEPAGE 128
-
-/* format specific variables */
-
-#define BE_MP3_MODE_STEREO 0
-#define BE_MP3_MODE_JSTEREO 1
-#define BE_MP3_MODE_DUALCHANNEL 2
-#define BE_MP3_MODE_MONO 3
-
-
-
-#define MPEG1 1
-#define MPEG2 0
-
-#ifdef _BLADEDLL
-#undef FLOAT
- #include <Windows.h>
-#endif
-
-#define CURRENT_STRUCT_VERSION 1
-#define CURRENT_STRUCT_SIZE sizeof(BE_CONFIG) // is currently 331 bytes
-
-
-typedef enum
-{
- VBR_METHOD_NONE = -1,
- VBR_METHOD_DEFAULT = 0,
- VBR_METHOD_OLD = 1,
- VBR_METHOD_NEW = 2,
- VBR_METHOD_MTRH = 3,
- VBR_METHOD_ABR = 4
-} VBRMETHOD;
-
-typedef enum
-{
- LQP_NOPRESET =-1,
-
- // QUALITY PRESETS
- LQP_NORMAL_QUALITY = 0,
- LQP_LOW_QUALITY = 1,
- LQP_HIGH_QUALITY = 2,
- LQP_VOICE_QUALITY = 3,
- LQP_R3MIX = 4,
- LQP_VERYHIGH_QUALITY = 5,
- LQP_STANDARD = 6,
- LQP_FAST_STANDARD = 7,
- LQP_EXTREME = 8,
- LQP_FAST_EXTREME = 9,
- LQP_INSANE = 10,
- LQP_ABR = 11,
- LQP_CBR = 12,
- LQP_MEDIUM = 13,
- LQP_FAST_MEDIUM = 14,
-
- // NEW PRESET VALUES
- LQP_PHONE =1000,
- LQP_SW =2000,
- LQP_AM =3000,
- LQP_FM =4000,
- LQP_VOICE =5000,
- LQP_RADIO =6000,
- LQP_TAPE =7000,
- LQP_HIFI =8000,
- LQP_CD =9000,
- LQP_STUDIO =10000
-
-} LAME_QUALITY_PRESET;
-
-
-
-typedef struct {
- unsigned long dwConfig; // BE_CONFIG_XXXXX
- // Currently only BE_CONFIG_MP3 is supported
- union {
-
- struct {
-
- unsigned long dwSampleRate; // 48000, 44100 and 32000 allowed
- unsigned char byMode; // BE_MP3_MODE_STEREO, BE_MP3_MODE_DUALCHANNEL, BE_MP3_MODE_MONO
- unsigned short wBitrate; // 32, 40, 48, 56, 64, 80, 96, 112, 128, 160, 192, 224, 256 and 320 allowed
- int bPrivate;
- int bCRC;
- int bCopyright;
- int bOriginal;
-
- } mp3; // BE_CONFIG_MP3
-
- struct
- {
- // STRUCTURE INFORMATION
- unsigned long dwStructVersion;
- unsigned long dwStructSize;
-
- // BASIC ENCODER SETTINGS
- unsigned long dwSampleRate; // SAMPLERATE OF INPUT FILE
- unsigned long dwReSampleRate; // DOWNSAMPLERATE, 0=ENCODER DECIDES
- long nMode; // BE_MP3_MODE_STEREO, BE_MP3_MODE_DUALCHANNEL, BE_MP3_MODE_MONO
- unsigned long dwBitrate; // CBR bitrate, VBR min bitrate
- unsigned long dwMaxBitrate; // CBR ignored, VBR Max bitrate
- long nPreset; // Quality preset, use one of the settings of the LAME_QUALITY_PRESET enum
- unsigned long dwMpegVersion; // FUTURE USE, MPEG-1 OR MPEG-2
- unsigned long dwPsyModel; // FUTURE USE, SET TO 0
- unsigned long dwEmphasis; // FUTURE USE, SET TO 0
-
- // BIT STREAM SETTINGS
- int bPrivate; // Set Private Bit (TRUE/FALSE)
- int bCRC; // Insert CRC (TRUE/FALSE)
- int bCopyright; // Set Copyright Bit (TRUE/FALSE)
- int bOriginal; // Set Original Bit (TRUE/FALSE)
-
- // VBR STUFF
- int bWriteVBRHeader; // WRITE XING VBR HEADER (TRUE/FALSE)
- int bEnableVBR; // USE VBR ENCODING (TRUE/FALSE)
- int nVBRQuality; // VBR QUALITY 0..9
- unsigned long dwVbrAbr_bps; // Use ABR in stead of nVBRQuality
- VBRMETHOD nVbrMethod;
- int bNoRes; // Disable Bit resorvoir (TRUE/FALSE)
-
- // MISC SETTINGS
- int bStrictIso; // Use strict ISO encoding rules (TRUE/FALSE)
- unsigned short nQuality; // Quality Setting, HIGH unsigned char should be NOT LOW byte, otherwhise quality=5
-
- // FUTURE USE, SET TO 0, align strucutre to 331 bytes
- unsigned char btReserved[255-4*sizeof(unsigned long) - sizeof( unsigned short )];
-
- } LHV1; // LAME header version 1
-
- struct {
-
- unsigned long dwSampleRate;
- unsigned char byMode;
- unsigned short wBitrate;
- unsigned char byEncodingMethod;
-
- } aac;
-
- } format;
-
-} BE_CONFIG, *PBE_CONFIG ATTRIBUTE_PACKED;
-
-
-typedef struct {
-
- // BladeEnc DLL Version number
-
- unsigned char byDLLMajorVersion;
- unsigned char byDLLMinorVersion;
-
- // BladeEnc Engine Version Number
-
- unsigned char byMajorVersion;
- unsigned char byMinorVersion;
-
- // DLL Release date
-
- unsigned char byDay;
- unsigned char byMonth;
- unsigned short wYear;
-
- // BladeEnc Homepage URL
-
- char zHomepage[BE_MAX_HOMEPAGE + 1];
-
- unsigned char byAlphaLevel;
- unsigned char byBetaLevel;
- unsigned char byMMXEnabled;
-
- unsigned char btReserved[125];
-
-
-} BE_VERSION, *PBE_VERSION ATTRIBUTE_PACKED;
-
-#ifndef _BLADEDLL
-
-typedef unsigned long (*BEINITSTREAM) (PBE_CONFIG, unsigned long *, unsigned long *, PHBE_STREAM);
-typedef unsigned long (*BEENCODECHUNK) (HBE_STREAM, unsigned long, short *, unsigned char *, unsigned long *);
-
-// added for floating point audio -- DSPguru, jd
-typedef unsigned long (*BEENCODECHUNKFLOATS16NI) (HBE_STREAM, unsigned long, float *, float *, unsigned char *, unsigned long *);
-typedef unsigned long (*BEDEINITSTREAM) (HBE_STREAM, unsigned char *, unsigned long *);
-typedef unsigned long (*BECLOSESTREAM) (HBE_STREAM);
-typedef void (*BEVERSION) (PBE_VERSION);
-typedef unsigned long (*BEWRITEVBRHEADER) (const char*);
-typedef unsigned long (*BEWRITEINFOTAG) (HBE_STREAM, const char * );
-
-#define TEXT_BEINITSTREAM "beInitStream"
-#define TEXT_BEENCODECHUNK "beEncodeChunk"
-#define TEXT_BEENCODECHUNKFLOATS16NI "beEncodeChunkFloatS16NI"
-#define TEXT_BEDEINITSTREAM "beDeinitStream"
-#define TEXT_BECLOSESTREAM "beCloseStream"
-#define TEXT_BEVERSION "beVersion"
-#define TEXT_BEWRITEVBRHEADER "beWriteVBRHeader"
-#define TEXT_BEFLUSHNOGAP "beFlushNoGap"
-#define TEXT_BEWRITEINFOTAG "beWriteInfoTag"
-
-
-#else
-
-__declspec(dllexport) unsigned long beInitStream(PBE_CONFIG pbeConfig, Punsigned long dwSamples, Punsigned long dwBufferSize, PHBE_STREAM phbeStream);
-__declspec(dllexport) unsigned long beEncodeChunk(HBE_STREAM hbeStream, unsigned long nSamples, PSHORT pSamples, Punsigned char pOutput, Punsigned long pdwOutput);
-
-// added for floating point audio -- DSPguru, jd
-__declspec(dllexport) unsigned long beEncodeChunkFloatS16NI(HBE_STREAM hbeStream, unsigned long nSamples, PFLOAT buffer_l, PFLOAT buffer_r, Punsigned char pOutput, Punsigned long pdwOutput);
-__declspec(dllexport) unsigned long beDeinitStream(HBE_STREAM hbeStream, Punsigned char pOutput, Punsigned long pdwOutput);
-__declspec(dllexport) unsigned long beCloseStream(HBE_STREAM hbeStream);
-__declspec(dllexport) VOID beVersion(PBE_VERSION pbeVersion);
-__declspec(dllexport) unsigned long beWriteVBRHeader(LPCSTR lpszFileName);
-__declspec(dllexport) unsigned long beFlushNoGap(HBE_STREAM hbeStream, Punsigned char pOutput, Punsigned long pdwOutput);
-__declspec(dllexport) unsigned long beWriteInfoTag( HBE_STREAM hbeStream, LPCSTR lpszFileName );
-
-#endif
-
-#ifndef __GNUC__
-#pragma pack(pop)
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/sflphone-common/libs/pjproject/third_party/mp3/mp3_port.h b/sflphone-common/libs/pjproject/third_party/mp3/mp3_port.h
deleted file mode 100644
index fe8bbb751453af96d87ab07da80bb0b8dfa854cb..0000000000000000000000000000000000000000
--- a/sflphone-common/libs/pjproject/third_party/mp3/mp3_port.h
+++ /dev/null
@@ -1,147 +0,0 @@
-/* $Id: mp3_port.h 1177 2007-04-09 07:06:08Z bennylp $ */
-/*
- * Copyright (C) 2003-2007 Benny Prijono <benny@prijono.org>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-/*
- * Contributed by:
- * Toni < buldozer at aufbix dot org >
- */
-
-#ifndef __PJMEDIA_MP3_PORT_H__
-#define __PJMEDIA_MP3_PORT_H__
-
-
-/**
- * @file mp3_port.h
- * @brief MP3 writer
- */
-#include <pjmedia/port.h>
-
-/**
- * @defgroup PJMEDIA_MP3_FILE_REC MP3 Audio File Writer (Recorder)
- * @ingroup PJMEDIA_PORT
- * @brief MP3 Audio File Writer (Recorder)
- * @{
- *
- * This section describes MP3 file writer. Currently it only works on Windows
- * using BladeEncDLL of the LAME MP3 encoder. <b>Note that the LAME_ENC.DLL
- * file must exist in the PATH so that the encoder can work properly.</b>
- *
- * The MP3 file writer is created with #pjmedia_mp3_writer_port_create() which
- * among other things specifies the desired file name and audio properties.
- * It then takes PCM input when #pjmedia_port_put_frame() is called and encode
- * the PCM input into MP3 streams before writing it to the .mp3 file.
- */
-
-
-PJ_BEGIN_DECL
-
-
-/**
- * This structure contains encoding options that can be specified during
- * MP3 writer port creation. Application should always zero the structure
- * before setting some value to make sure that default options will be used.
- */
-typedef struct pjmedia_mp3_encoder_option
-{
- /** Specify whether variable bit rate should be used. Variable bitrate
- * would normally produce better quality at the expense of probably
- * larger file.
- */
- pj_bool_t vbr;
-
- /** Target bitrate, in bps. If VBR is enabled, this settings specifies
- * the average bit-rate requested, and will make the encoder ignore
- * the quality setting. For CBR, this specifies the actual bitrate,
- * and if this option is zero, it will be set to the sampling rate
- * multiplied by number of channels.
- */
- unsigned bit_rate;
-
- /** Encoding quality, 0-9, with 0 is the highest quality. For VBR, the
- * quality setting will only take effect when bit_rate setting is zero.
- */
- unsigned quality;
-
-} pjmedia_mp3_encoder_option;
-
-
-/**
- * Create a media port to record PCM media to a MP3 file. After the port
- * is created, application can call #pjmedia_port_put_frame() to feed the
- * port with PCM frames. The port then will encode the PCM frame into MP3
- * stream, and store it to MP3 file specified in the argument.
- *
- * When application has finished with writing MP3 file, it must destroy the
- * media port with #pjmedia_port_destroy() so that the MP3 file can be
- * closed properly.
- *
- * @param pool Pool to create memory buffers for this port.
- * @param filename File name.
- * @param clock_rate The sampling rate.
- * @param channel_count Number of channels.
- * @param samples_per_frame Number of samples per frame.
- * @param bits_per_sample Number of bits per sample (eg 16).
- * @param option Optional option to set encoding parameters.
- * @param p_port Pointer to receive the file port instance.
- *
- * @return PJ_SUCCESS on success.
- */
-PJ_DECL(pj_status_t)
-pjmedia_mp3_writer_port_create(pj_pool_t *pool,
- const char *filename,
- unsigned clock_rate,
- unsigned channel_count,
- unsigned samples_per_frame,
- unsigned bits_per_sample,
- const pjmedia_mp3_encoder_option *option,
- pjmedia_port **p_port );
-
-/**
- * Register the callback to be called when the file writing has reached
- * certain size. Application can use this callback, for example, to limit
- * the size of the output file.
- *
- * @param port The file writer port.
- * @param pos The file position on which the callback will be called.
- * @param user_data User data to be specified in the callback, and will be
- * given on the callback.
- * @param cb Callback to be called. If the callback returns non-
- * PJ_SUCCESS, the writing will stop. Note that if
- * application destroys the port in the callback, it must
- * return non-PJ_SUCCESS here.
- *
- * @return PJ_SUCCESS on success.
- */
-PJ_DECL(pj_status_t)
-pjmedia_mp3_writer_port_set_cb( pjmedia_port *port,
- pj_size_t pos,
- void *user_data,
- pj_status_t (*cb)(pjmedia_port *port,
- void *usr_data));
-
-
-/**
- * @}
- */
-
-
-PJ_END_DECL
-
-#endif /* __PJMEDIA_MP3_PORT_H__ */
-
diff --git a/sflphone-common/libs/pjproject/third_party/mp3/mp3_writer.c b/sflphone-common/libs/pjproject/third_party/mp3/mp3_writer.c
deleted file mode 100644
index 4abd78d449f12e0694032b84cca3ed39964f3e43..0000000000000000000000000000000000000000
--- a/sflphone-common/libs/pjproject/third_party/mp3/mp3_writer.c
+++ /dev/null
@@ -1,563 +0,0 @@
-/* $Id: mp3_writer.c 1233 2007-04-30 11:05:23Z bennylp $ */
-/*
- * Copyright (C) 2003-2007 Benny Prijono <benny@prijono.org>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-/*
- * Contributed by:
- * Toni < buldozer at aufbix dot org >
- */
-#include "mp3_port.h"
-#include <pjmedia/errno.h>
-#include <pj/assert.h>
-#include <pj/file_access.h>
-#include <pj/file_io.h>
-#include <pj/log.h>
-#include <pj/pool.h>
-#include <pj/string.h>
-#include <pj/unicode.h>
-
-
-/* Include BladeDLL declarations */
-#include "BladeMP3EncDLL.h"
-
-
-#define THIS_FILE "mp3_writer.c"
-#define SIGNATURE PJMEDIA_PORT_SIGNATURE('F', 'W', 'M', '3')
-#define BYTES_PER_SAMPLE 2
-
-static struct BladeDLL
-{
- void *hModule;
- int refCount;
- BEINITSTREAM beInitStream;
- BEENCODECHUNK beEncodeChunk;
- BEDEINITSTREAM beDeinitStream;
- BECLOSESTREAM beCloseStream;
- BEVERSION beVersion;
- BEWRITEVBRHEADER beWriteVBRHeader;
- BEWRITEINFOTAG beWriteInfoTag;
-} BladeDLL;
-
-
-struct mp3_file_port
-{
- pjmedia_port base;
- pj_size_t total;
- pj_oshandle_t fd;
- pj_size_t cb_size;
- pj_status_t (*cb)(pjmedia_port*, void*);
-
- unsigned silence_duration;
-
- pj_str_t mp3_filename;
- pjmedia_mp3_encoder_option mp3_option;
- unsigned mp3_samples_per_frame;
- pj_int16_t *mp3_sample_buf;
- unsigned mp3_sample_pos;
- HBE_STREAM mp3_stream;
- unsigned char *mp3_buf;
-};
-
-
-static pj_status_t file_put_frame(pjmedia_port *this_port,
- const pjmedia_frame *frame);
-static pj_status_t file_get_frame(pjmedia_port *this_port,
- pjmedia_frame *frame);
-static pj_status_t file_on_destroy(pjmedia_port *this_port);
-
-
-#if defined(PJ_WIN32) || defined(_WIN32) || defined(WIN32)
-
-#include <windows.h>
-#define DLL_NAME PJ_T("LAME_ENC.DLL")
-
-/*
- * Load BladeEncoder DLL.
- */
-static pj_status_t init_blade_dll(void)
-{
- if (BladeDLL.refCount == 0) {
- #define GET_PROC(type, name) \
- BladeDLL.name = (type)GetProcAddress(BladeDLL.hModule, PJ_T(#name)); \
- if (BladeDLL.name == NULL) { \
- PJ_LOG(1,(THIS_FILE, "Unable to find %s in %s", #name, DLL_NAME)); \
- return PJ_RETURN_OS_ERROR(GetLastError()); \
- }
-
- BE_VERSION beVersion;
- BladeDLL.hModule = (void*)LoadLibrary(DLL_NAME);
- if (BladeDLL.hModule == NULL) {
- pj_status_t status = PJ_RETURN_OS_ERROR(GetLastError());
- char errmsg[PJ_ERR_MSG_SIZE];
-
- pj_strerror(status, errmsg, sizeof(errmsg));
- PJ_LOG(1,(THIS_FILE, "Unable to load %s: %s", DLL_NAME, errmsg));
- return status;
- }
-
- GET_PROC(BEINITSTREAM, beInitStream);
- GET_PROC(BEENCODECHUNK, beEncodeChunk);
- GET_PROC(BEDEINITSTREAM, beDeinitStream);
- GET_PROC(BECLOSESTREAM, beCloseStream);
- GET_PROC(BEVERSION, beVersion);
- GET_PROC(BEWRITEVBRHEADER, beWriteVBRHeader);
- GET_PROC(BEWRITEINFOTAG, beWriteInfoTag);
-
- #undef GET_PROC
-
- BladeDLL.beVersion(&beVersion);
- PJ_LOG(4,(THIS_FILE, "%s encoder v%d.%d loaded (%s)", DLL_NAME,
- beVersion.byMajorVersion, beVersion.byMinorVersion,
- beVersion.zHomepage));
- }
- ++BladeDLL.refCount;
- return PJ_SUCCESS;
-}
-
-/*
- * Decrement the reference counter of the DLL.
- */
-static void deinit_blade_dll()
-{
- --BladeDLL.refCount;
- if (BladeDLL.refCount == 0 && BladeDLL.hModule) {
- FreeLibrary(BladeDLL.hModule);
- BladeDLL.hModule = NULL;
- PJ_LOG(4,(THIS_FILE, "%s unloaded", DLL_NAME));
- }
-}
-
-#else
-
-static pj_status_t init_blade_dll(void)
-{
- PJ_LOG(1,(THIS_FILE, "Error: MP3 writer port only works on Windows for now"));
- return PJ_ENOTSUP;
-}
-
-static void deinit_blade_dll()
-{
-}
-#endif
-
-
-
-/*
- * Initialize MP3 encoder.
- */
-static pj_status_t init_mp3_encoder(struct mp3_file_port *fport,
- pj_pool_t *pool)
-{
- BE_CONFIG LConfig;
- unsigned long InSamples;
- unsigned long OutBuffSize;
- long MP3Err;
-
- /*
- * Initialize encoder configuration.
- */
- pj_bzero(&LConfig, sizeof(BE_CONFIG));
- LConfig.dwConfig = BE_CONFIG_LAME;
- LConfig.format.LHV1.dwStructVersion = 1;
- LConfig.format.LHV1.dwStructSize = sizeof(BE_CONFIG);
- LConfig.format.LHV1.dwSampleRate = fport->base.info.clock_rate;
- LConfig.format.LHV1.dwReSampleRate = 0;
-
- if (fport->base.info.channel_count==1)
- LConfig.format.LHV1.nMode = BE_MP3_MODE_MONO;
- else if (fport->base.info.channel_count==2)
- LConfig.format.LHV1.nMode = BE_MP3_MODE_STEREO;
- else
- return PJMEDIA_ENCCHANNEL;
-
- LConfig.format.LHV1.dwBitrate = fport->mp3_option.bit_rate / 1000;
- LConfig.format.LHV1.nPreset = LQP_NOPRESET;
- LConfig.format.LHV1.bCopyright = 0;
- LConfig.format.LHV1.bCRC = 1;
- LConfig.format.LHV1.bOriginal = 1;
- LConfig.format.LHV1.bPrivate = 0;
-
- if (!fport->mp3_option.vbr) {
- LConfig.format.LHV1.nVbrMethod = VBR_METHOD_NONE;
- LConfig.format.LHV1.bWriteVBRHeader = 0;
- LConfig.format.LHV1.bEnableVBR = 0;
- } else {
- LConfig.format.LHV1.nVbrMethod = VBR_METHOD_DEFAULT;
- LConfig.format.LHV1.bWriteVBRHeader = 1;
- LConfig.format.LHV1.dwVbrAbr_bps = fport->mp3_option.bit_rate;
- LConfig.format.LHV1.nVBRQuality = (pj_uint16_t)
- fport->mp3_option.quality;
- LConfig.format.LHV1.bEnableVBR = 1;
- }
-
- LConfig.format.LHV1.nQuality = (pj_uint16_t)
- (((0-fport->mp3_option.quality-1)<<8) |
- fport->mp3_option.quality);
-
- /*
- * Init MP3 stream.
- */
- InSamples = 0;
- MP3Err = BladeDLL.beInitStream(&LConfig, &InSamples, &OutBuffSize,
- &fport->mp3_stream);
- if (MP3Err != BE_ERR_SUCCESSFUL)
- return PJMEDIA_ERROR;
-
- /*
- * Allocate sample buffer.
- */
- fport->mp3_samples_per_frame = (unsigned)InSamples;
- fport->mp3_sample_buf = pj_pool_alloc(pool, fport->mp3_samples_per_frame * 2);
- if (!fport->mp3_sample_buf)
- return PJ_ENOMEM;
-
- /*
- * Allocate encoded MP3 buffer.
- */
- fport->mp3_buf = pj_pool_alloc(pool, (pj_size_t)OutBuffSize);
- if (fport->mp3_buf == NULL)
- return PJ_ENOMEM;
-
-
- return PJ_SUCCESS;
-}
-
-
-/*
- * Create MP3 file writer port.
- */
-PJ_DEF(pj_status_t)
-pjmedia_mp3_writer_port_create( pj_pool_t *pool,
- const char *filename,
- unsigned sampling_rate,
- unsigned channel_count,
- unsigned samples_per_frame,
- unsigned bits_per_sample,
- const pjmedia_mp3_encoder_option *param_option,
- pjmedia_port **p_port )
-{
- struct mp3_file_port *fport;
- pj_status_t status;
-
- status = init_blade_dll();
- if (status != PJ_SUCCESS)
- return status;
-
- /* Check arguments. */
- PJ_ASSERT_RETURN(pool && filename && p_port, PJ_EINVAL);
-
- /* Only supports 16bits per sample for now. */
- PJ_ASSERT_RETURN(bits_per_sample == 16, PJ_EINVAL);
-
- /* Create file port instance. */
- fport = pj_pool_zalloc(pool, sizeof(struct mp3_file_port));
- PJ_ASSERT_RETURN(fport != NULL, PJ_ENOMEM);
-
- /* Initialize port info. */
- pj_strdup2_with_null(pool, &fport->mp3_filename, filename);
- pjmedia_port_info_init(&fport->base.info, &fport->mp3_filename, SIGNATURE,
- sampling_rate, channel_count, bits_per_sample,
- samples_per_frame);
-
- fport->base.get_frame = &file_get_frame;
- fport->base.put_frame = &file_put_frame;
- fport->base.on_destroy = &file_on_destroy;
-
-
- /* Open file in write and read mode.
- * We need the read mode because we'll modify the WAVE header once
- * the recording has completed.
- */
- status = pj_file_open(pool, filename, PJ_O_WRONLY, &fport->fd);
- if (status != PJ_SUCCESS) {
- deinit_blade_dll();
- return status;
- }
-
- /* Copy and initialize option with default settings */
- if (param_option) {
- pj_memcpy(&fport->mp3_option, param_option,
- sizeof(pjmedia_mp3_encoder_option));
- } else {
- pj_bzero(&fport->mp3_option, sizeof(pjmedia_mp3_encoder_option));
- fport->mp3_option.vbr = PJ_TRUE;
- }
-
- /* Calculate bitrate if it's not specified, only if it's not VBR. */
- if (fport->mp3_option.bit_rate == 0 && !fport->mp3_option.vbr)
- fport->mp3_option.bit_rate = sampling_rate * channel_count;
-
- /* Set default quality if it's not specified */
- if (fport->mp3_option.quality == 0)
- fport->mp3_option.quality = 2;
-
- /* Init mp3 encoder */
- status = init_mp3_encoder(fport, pool);
- if (status != PJ_SUCCESS) {
- pj_file_close(fport->fd);
- deinit_blade_dll();
- return status;
- }
-
- /* Done. */
- *p_port = &fport->base;
-
- PJ_LOG(4,(THIS_FILE,
- "MP3 file writer '%.*s' created: samp.rate=%dKHz, "
- "bitrate=%dkbps%s, quality=%d",
- (int)fport->base.info.name.slen,
- fport->base.info.name.ptr,
- fport->base.info.clock_rate/1000,
- fport->mp3_option.bit_rate/1000,
- (fport->mp3_option.vbr ? " (VBR)" : ""),
- fport->mp3_option.quality));
-
- return PJ_SUCCESS;
-}
-
-
-
-/*
- * Register callback.
- */
-PJ_DEF(pj_status_t)
-pjmedia_mp3_writer_port_set_cb( pjmedia_port *port,
- pj_size_t pos,
- void *user_data,
- pj_status_t (*cb)(pjmedia_port *port,
- void *usr_data))
-{
- struct mp3_file_port *fport;
-
- /* Sanity check */
- PJ_ASSERT_RETURN(port && cb, PJ_EINVAL);
-
- /* Check that this is really a writer port */
- PJ_ASSERT_RETURN(port->info.signature == SIGNATURE, PJ_EINVALIDOP);
-
- fport = (struct mp3_file_port*) port;
-
- fport->cb_size = pos;
- fport->base.port_data.pdata = user_data;
- fport->cb = cb;
-
- return PJ_SUCCESS;
-
-}
-
-
-/*
- * Put a frame into the buffer. When the buffer is full, flush the buffer
- * to the file.
- */
-static pj_status_t file_put_frame(pjmedia_port *this_port,
- const pjmedia_frame *frame)
-{
- struct mp3_file_port *fport = (struct mp3_file_port *)this_port;
- unsigned long MP3Err;
- pj_ssize_t bytes;
- pj_status_t status;
- unsigned long WriteSize;
-
- /* Record silence if input is no-frame */
- if (frame->type == PJMEDIA_FRAME_TYPE_NONE || frame->size == 0) {
- unsigned samples_left = fport->base.info.samples_per_frame;
- unsigned samples_copied = 0;
-
- /* Only want to record at most 1 second of silence */
- if (fport->silence_duration >= fport->base.info.clock_rate)
- return PJ_SUCCESS;
-
- while (samples_left) {
- unsigned samples_needed = fport->mp3_samples_per_frame -
- fport->mp3_sample_pos;
- if (samples_needed > samples_left)
- samples_needed = samples_left;
-
- pjmedia_zero_samples(fport->mp3_sample_buf + fport->mp3_sample_pos,
- samples_needed);
- fport->mp3_sample_pos += samples_needed;
- samples_left -= samples_needed;
- samples_copied += samples_needed;
-
- /* Encode if we have full frame */
- if (fport->mp3_sample_pos == fport->mp3_samples_per_frame) {
-
- /* Clear position */
- fport->mp3_sample_pos = 0;
-
- /* Encode ! */
- MP3Err = BladeDLL.beEncodeChunk(fport->mp3_stream,
- fport->mp3_samples_per_frame,
- fport->mp3_sample_buf,
- fport->mp3_buf,
- &WriteSize);
- if (MP3Err != BE_ERR_SUCCESSFUL)
- return PJMEDIA_ERROR;
-
- /* Write the chunk */
- bytes = WriteSize;
- status = pj_file_write(fport->fd, fport->mp3_buf, &bytes);
- if (status != PJ_SUCCESS)
- return status;
-
- /* Increment total written. */
- fport->total += bytes;
- }
- }
-
- fport->silence_duration += fport->base.info.samples_per_frame;
-
- }
- /* If encoder is expecting different sample size, then we need to
- * buffer the samples.
- */
- else if (fport->mp3_samples_per_frame !=
- fport->base.info.samples_per_frame)
- {
- unsigned samples_left = frame->size / 2;
- unsigned samples_copied = 0;
- const pj_int16_t *src_samples = frame->buf;
-
- fport->silence_duration = 0;
-
- while (samples_left) {
- unsigned samples_needed = fport->mp3_samples_per_frame -
- fport->mp3_sample_pos;
- if (samples_needed > samples_left)
- samples_needed = samples_left;
-
- pjmedia_copy_samples(fport->mp3_sample_buf + fport->mp3_sample_pos,
- src_samples + samples_copied,
- samples_needed);
- fport->mp3_sample_pos += samples_needed;
- samples_left -= samples_needed;
- samples_copied += samples_needed;
-
- /* Encode if we have full frame */
- if (fport->mp3_sample_pos == fport->mp3_samples_per_frame) {
-
- /* Clear position */
- fport->mp3_sample_pos = 0;
-
- /* Encode ! */
- MP3Err = BladeDLL.beEncodeChunk(fport->mp3_stream,
- fport->mp3_samples_per_frame,
- fport->mp3_sample_buf,
- fport->mp3_buf,
- &WriteSize);
- if (MP3Err != BE_ERR_SUCCESSFUL)
- return PJMEDIA_ERROR;
-
- /* Write the chunk */
- bytes = WriteSize;
- status = pj_file_write(fport->fd, fport->mp3_buf, &bytes);
- if (status != PJ_SUCCESS)
- return status;
-
- /* Increment total written. */
- fport->total += bytes;
- }
- }
-
- } else {
-
- fport->silence_duration = 0;
-
- /* Encode ! */
- MP3Err = BladeDLL.beEncodeChunk(fport->mp3_stream,
- fport->mp3_samples_per_frame,
- frame->buf,
- fport->mp3_buf,
- &WriteSize);
- if (MP3Err != BE_ERR_SUCCESSFUL)
- return PJMEDIA_ERROR;
-
- /* Write the chunk */
- bytes = WriteSize;
- status = pj_file_write(fport->fd, fport->mp3_buf, &bytes);
- if (status != PJ_SUCCESS)
- return status;
-
- /* Increment total written. */
- fport->total += bytes;
- }
-
- /* Increment total written, and check if we need to call callback */
-
- if (fport->cb && fport->total >= fport->cb_size) {
- pj_status_t (*cb)(pjmedia_port*, void*);
- pj_status_t status;
-
- cb = fport->cb;
- fport->cb = NULL;
-
- status = (*cb)(this_port, this_port->port_data.pdata);
- return status;
- }
-
- return PJ_SUCCESS;
-}
-
-/*
- * Get frame, basicy is a no-op operation.
- */
-static pj_status_t file_get_frame(pjmedia_port *this_port,
- pjmedia_frame *frame)
-{
- PJ_UNUSED_ARG(this_port);
- PJ_UNUSED_ARG(frame);
- return PJ_EINVALIDOP;
-}
-
-
-/*
- * Close the port, modify file header with updated file length.
- */
-static pj_status_t file_on_destroy(pjmedia_port *this_port)
-{
- struct mp3_file_port *fport = (struct mp3_file_port*)this_port;
- pj_status_t status;
- unsigned long WriteSize;
- unsigned long MP3Err;
-
-
- /* Close encoder */
- MP3Err = BladeDLL.beDeinitStream(fport->mp3_stream, fport->mp3_buf,
- &WriteSize);
- if (MP3Err == BE_ERR_SUCCESSFUL) {
- pj_ssize_t bytes = WriteSize;
- status = pj_file_write(fport->fd, fport->mp3_buf, &bytes);
- }
-
- /* Close file */
- status = pj_file_close(fport->fd);
-
- /* Write additional VBR header */
- if (fport->mp3_option.vbr) {
- MP3Err = BladeDLL.beWriteVBRHeader(fport->mp3_filename.ptr);
- }
-
-
- /* Decrement DLL reference counter */
- deinit_blade_dll();
-
- /* Done. */
- return PJ_SUCCESS;
-}
-
diff --git a/sflphone-common/src/account.cpp b/sflphone-common/src/account.cpp
index 55d21bf5d40d0d9440754272740aac48be8d8434..40da977a2050c990bd347218a8820daf6bdc36ad 100644
--- a/sflphone-common/src/account.cpp
+++ b/sflphone-common/src/account.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2006-2009 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
*
* Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
* Author: Alexandre Bourget <alexandre.bourget@savoirfairelinux.com>
@@ -17,6 +17,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include "account.h"
diff --git a/sflphone-common/src/account.h b/sflphone-common/src/account.h
index ce9f45da987db6c10b2719dbb32dfe56945a93a1..80bfbd36ba1838b9e0c2d6dc482b3185f3e44219 100644
--- a/sflphone-common/src/account.h
+++ b/sflphone-common/src/account.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2006-2009 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
* Author: Yan Morin <yan.morin@savoirfairelinux.com>
*
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef ACCOUNT_H
diff --git a/sflphone-common/src/accountcreator.cpp b/sflphone-common/src/accountcreator.cpp
index be0d6f8f353d8a01b95fe8fb35eaff6f00408d79..c0b2abc383a972223cff6d44928d7c916f00b1be 100644
--- a/sflphone-common/src/accountcreator.cpp
+++ b/sflphone-common/src/accountcreator.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2006-2007 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Alexandre Bourget <alexandre.bourget@savoirfairelinux.com>
* Author: Yan Morin <yan.morin@savoirfairelinux.com>
*
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include "accountcreator.h"
#include "sip/sipaccount.h"
diff --git a/sflphone-common/src/accountcreator.h b/sflphone-common/src/accountcreator.h
index 6add7a7ac690a47ce4607a6b43453a23ca874124..b0c93191201635f99c84d5061478f178865e3000 100644
--- a/sflphone-common/src/accountcreator.h
+++ b/sflphone-common/src/accountcreator.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2006-2007 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Alexandre Bourget <alexandre.bourget@savoirfairelinux.com>
* Author: Yan Morin <yan.morin@savoirfairelinux.com>
*
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef ACCOUNTCREATOR_H
#define ACCOUNTCREATOR_H
diff --git a/sflphone-common/src/audio/algorithm.h b/sflphone-common/src/audio/algorithm.h
index 6da74c1c70d3950e2db0d006cfef591ab4bc80b2..6f147471860f97504107db69ae1ba9294c518632 100644
--- a/sflphone-common/src/audio/algorithm.h
+++ b/sflphone-common/src/audio/algorithm.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008 2009 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Alexandre Savard <alexandre.savard@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,6 +15,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef ALGORITHM_H
diff --git a/sflphone-common/src/audio/alsa/alsalayer.cpp b/sflphone-common/src/audio/alsa/alsalayer.cpp
index ec08bac656fb0135a0d436c8959d42250ae56805..878190a73d4a8900583982a2df0ee1eb8e365c9a 100644
--- a/sflphone-common/src/audio/alsa/alsalayer.cpp
+++ b/sflphone-common/src/audio/alsa/alsalayer.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008 2009 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
* Author: Alexandre Savard <alexandre.savard@savoirfairelinux.com>
*
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include "alsalayer.h"
diff --git a/sflphone-common/src/audio/alsa/alsalayer.h b/sflphone-common/src/audio/alsa/alsalayer.h
index 29a94711c89b71f1e27722022079f31bdd9008cd..2889eda5fe833b32b0ab5c0600988a92d1f934e5 100644
--- a/sflphone-common/src/audio/alsa/alsalayer.h
+++ b/sflphone-common/src/audio/alsa/alsalayer.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2007 - 2008 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
* Author: Alexandre Savard <alexandre.savard@savoirfairelinux.com>
*
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef _ALSA_LAYER_H
diff --git a/sflphone-common/src/audio/audiodevice.cpp b/sflphone-common/src/audio/audiodevice.cpp
index 07c3edb4f23b8b9be2f44ce6b90048b8688ba66a..1fd9744690f66faefc1b42d8b6267b78bc888d30 100644
--- a/sflphone-common/src/audio/audiodevice.cpp
+++ b/sflphone-common/src/audio/audiodevice.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2006 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Yan Morin <yan.morin@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,6 +15,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include "audiodevice.h"
diff --git a/sflphone-common/src/audio/audiodevice.h b/sflphone-common/src/audio/audiodevice.h
index ccc5840324208bd5f161a1438bd21abcc5b08f5e..306afbeb8c24bc1d41a111f5b95d3683c34eb6e9 100644
--- a/sflphone-common/src/audio/audiodevice.h
+++ b/sflphone-common/src/audio/audiodevice.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2006 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Yan Morin <yan.morin@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,6 +15,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef _AUDIO_DEVICE_H
diff --git a/sflphone-common/src/audio/audiolayer.cpp b/sflphone-common/src/audio/audiolayer.cpp
index c6b40d81ef122f51b23a125b0f2569fc1e5295b6..45d23a7bd613515cf1c80513736b4b47289f4bfa 100644
--- a/sflphone-common/src/audio/audiolayer.cpp
+++ b/sflphone-common/src/audio/audiolayer.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2009 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,6 +15,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include "audiolayer.h"
diff --git a/sflphone-common/src/audio/audiolayer.h b/sflphone-common/src/audio/audiolayer.h
index bb979cd86a347fdaf6fe6f90c3160c5ed80a21bc..62a96a871ff97fb504dddf133724ed229df8f577 100644
--- a/sflphone-common/src/audio/audiolayer.h
+++ b/sflphone-common/src/audio/audiolayer.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2004-2008 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Yan Morin <yan.morin@savoirfairelinux.com>
* Author: Jerome Oufella <jerome.oufella@savoirfairelinux.com>
* Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
@@ -17,6 +17,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef _AUDIO_LAYER_H
diff --git a/sflphone-common/src/audio/audioloop.cpp b/sflphone-common/src/audio/audioloop.cpp
index 633192de44bf5a4ed82b5d9fb34e28117d3e0fa5..67626daa59f7936922d914efcb4b25fa5f7d9c2f 100644
--- a/sflphone-common/src/audio/audioloop.cpp
+++ b/sflphone-common/src/audio/audioloop.cpp
@@ -1,5 +1,5 @@
-/**
- * Copyright (C) 2005 Savoir-Faire Linux inc.
+/*
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Yan Morin <yan.morin@savoirfairelinux.com>
*
* Inspired by tonegenerator of
@@ -19,7 +19,19 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
+
#include "audioloop.h"
#include <math.h>
#include <strings.h>
diff --git a/sflphone-common/src/audio/audioloop.h b/sflphone-common/src/audio/audioloop.h
index 1d9a068b83cb1db9b9ecd772cf6ac2c348cb0307..98f01726f12317ae8c8b60e3bcba671f2ce41a8b 100644
--- a/sflphone-common/src/audio/audioloop.h
+++ b/sflphone-common/src/audio/audioloop.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2005 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Yan Morin <yan.morin@savoirfairelinux.com>
*
* Inspired by tonegenerator of
@@ -18,6 +18,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __AUDIOLOOP_H__
#define __AUDIOLOOP_H__
diff --git a/sflphone-common/src/audio/audioprocessing.cpp b/sflphone-common/src/audio/audioprocessing.cpp
index 36f17f6fcd60dfe4870a44326fd63f9aafedf935..264bbef498d8ab4b054bf1fa5e134507d30d8f6f 100644
--- a/sflphone-common/src/audio/audioprocessing.cpp
+++ b/sflphone-common/src/audio/audioprocessing.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008 2009 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Alexandre Savard <alexandre.savard@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,6 +15,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
diff --git a/sflphone-common/src/audio/audioprocessing.h b/sflphone-common/src/audio/audioprocessing.h
index 1ef0464f69b132b2d8c9e4e73ddaae2ac6310fec..b69d6fc5058eef3611c602e3173703e196d1542c 100644
--- a/sflphone-common/src/audio/audioprocessing.h
+++ b/sflphone-common/src/audio/audioprocessing.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008 2009 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Alexandre Savard <alexandre.savard@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,6 +15,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
diff --git a/sflphone-common/src/audio/audiortp/AudioRtpFactory.cpp b/sflphone-common/src/audio/audiortp/AudioRtpFactory.cpp
index f7ef1ffe5d2c18935f83d50c6daf637885ec9b5c..85f53cf09e5e31ca623104932c608b8d3e56283b 100644
--- a/sflphone-common/src/audio/audiortp/AudioRtpFactory.cpp
+++ b/sflphone-common/src/audio/audiortp/AudioRtpFactory.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2009 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Pierre-Luc Bacon <pierre-luc.bacon@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -14,6 +14,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
diff --git a/sflphone-common/src/audio/audiortp/AudioRtpFactory.h b/sflphone-common/src/audio/audiortp/AudioRtpFactory.h
index de16a31fe610b5ae2e27420f451d47bb87d0b7a9..74de2364b94a16cf169aeadda853ec98ebc4becf 100644
--- a/sflphone-common/src/audio/audiortp/AudioRtpFactory.h
+++ b/sflphone-common/src/audio/audiortp/AudioRtpFactory.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2004-2009 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Pierre-Luc Bacon <pierre-luc.bacon@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -14,6 +14,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __SFL_AUDIO_RTP_FACTORY_H__
diff --git a/sflphone-common/src/audio/audiortp/AudioRtpSession.h b/sflphone-common/src/audio/audiortp/AudioRtpSession.h
index 7ce6a35b3da05db627e51c907ec7126edff5d229..cab3a977c668b9f4b853ed8bea7481b33331403a 100644
--- a/sflphone-common/src/audio/audiortp/AudioRtpSession.h
+++ b/sflphone-common/src/audio/audiortp/AudioRtpSession.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2009 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Pierre-Luc Bacon <pierre-luc.bacon@savoirfairelinux.com>
* Author: Alexandre Bourget <alexandre.bourget@savoirfairelinux.com>
* Author: Laurielle Lea <laurielle.lea@savoirfairelinux.com>
@@ -19,6 +19,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __SFL_AUDIO_RTP_SESSION_H__
#define __SFL_AUDIO_RTP_SESSION_H__
diff --git a/sflphone-common/src/audio/audiortp/AudioSrtpSession.cpp b/sflphone-common/src/audio/audiortp/AudioSrtpSession.cpp
index 8577c85b40ded945fdbf5b0f8debee389a407821..a5608d997a234a9583890eb42bc557dfe2350f8d 100644
--- a/sflphone-common/src/audio/audiortp/AudioSrtpSession.cpp
+++ b/sflphone-common/src/audio/audiortp/AudioSrtpSession.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2009 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Alexandre Savard <alexandre.savard@savoirfairelinux.com>
* Author: Pierre-Luc Bacon <pierre-luc.bacon@savoirfairelinux.com>
*
@@ -15,6 +15,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include "AudioSrtpSession.h"
#include "user_cfg.h"
diff --git a/sflphone-common/src/audio/audiortp/AudioSrtpSession.h b/sflphone-common/src/audio/audiortp/AudioSrtpSession.h
index 7dd888116b57e25b7c35b9fd34be3705afae279f..6b21cd329086c64ed6069dcaad53868d6668809c 100644
--- a/sflphone-common/src/audio/audiortp/AudioSrtpSession.h
+++ b/sflphone-common/src/audio/audiortp/AudioSrtpSession.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2009 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Alexandre Savard <alexandre.savard@savoirfairelinux.com>
* Author: Pierre-Luc Bacon <pierre-luc.bacon@savoirfairelinux.com>
*
@@ -15,6 +15,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __SFL_AUDIO_SRTP_SESSION_H__
#define __SFL_AUDIO_SRTP_SESSION_H__
diff --git a/sflphone-common/src/audio/audiortp/AudioSymmetricRtpSession.h b/sflphone-common/src/audio/audiortp/AudioSymmetricRtpSession.h
index ccba0d5dc8894c7f9118556ca6a5cfc66ec1da9a..0713f3db0c2cc82eb3d541a03f49d678f5d32776 100644
--- a/sflphone-common/src/audio/audiortp/AudioSymmetricRtpSession.h
+++ b/sflphone-common/src/audio/audiortp/AudioSymmetricRtpSession.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2009 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Pierre-Luc Bacon <pierre-luc.bacon@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -14,6 +14,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __SFL_AUDIO_SYMMETRIC_RTP_SESSION_H__
#define __SFL_AUDIO_SYMMETRIC_RTP_SESSION_H__
diff --git a/sflphone-common/src/audio/audiortp/AudioZrtpSession.cpp b/sflphone-common/src/audio/audiortp/AudioZrtpSession.cpp
index cb82fe29e227fe0071d48c6aeda2cab3be5e9008..6632bc2a61c63f87223b32b8447e13c6f5e4febe 100644
--- a/sflphone-common/src/audio/audiortp/AudioZrtpSession.cpp
+++ b/sflphone-common/src/audio/audiortp/AudioZrtpSession.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2009 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Pierre-Luc Bacon <pierre-luc.bacon@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -14,6 +14,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include "AudioZrtpSession.h"
#include "ZrtpSessionCallback.h"
diff --git a/sflphone-common/src/audio/audiortp/AudioZrtpSession.h b/sflphone-common/src/audio/audiortp/AudioZrtpSession.h
index 138bd2684733881494e2e26f8e1af01c85fe931c..f62515bcc9ad1712f59d49ecd6b91c9b5743bf1f 100644
--- a/sflphone-common/src/audio/audiortp/AudioZrtpSession.h
+++ b/sflphone-common/src/audio/audiortp/AudioZrtpSession.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2009 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Pierre-Luc Bacon <pierre-luc.bacon@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -14,6 +14,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __SFL_AUDIO_ZRTP_SESSION_H__
#define __SFL_AUDIO_ZRTP_SESSION_H__
diff --git a/sflphone-common/src/audio/audiortp/ZrtpSessionCallback.cpp b/sflphone-common/src/audio/audiortp/ZrtpSessionCallback.cpp
index 145792e0bce09f97977772b4602a12559e2d4566..b0be6b719eb86162e593d510d69191bb757df665 100644
--- a/sflphone-common/src/audio/audiortp/ZrtpSessionCallback.cpp
+++ b/sflphone-common/src/audio/audiortp/ZrtpSessionCallback.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2004-2009 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Pierre-Luc Bacon <pierre-luc.bacon@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,6 +15,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include "ZrtpSessionCallback.h"
diff --git a/sflphone-common/src/audio/audiortp/ZrtpSessionCallback.h b/sflphone-common/src/audio/audiortp/ZrtpSessionCallback.h
index ee41beafe3bf5f5aed8549924d46c67893a031dd..41e417e3f58aa0da0bca2f10e772bf08ee857145 100644
--- a/sflphone-common/src/audio/audiortp/ZrtpSessionCallback.h
+++ b/sflphone-common/src/audio/audiortp/ZrtpSessionCallback.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2004-2009 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Pierre-Luc Bacon <pierre-luc.bacon@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,6 +15,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __SFL_ZRTP_CALLBACK_H__
diff --git a/sflphone-common/src/audio/codecs/alaw.cpp b/sflphone-common/src/audio/codecs/alaw.cpp
index 9ed3cd56dedfd19cab165897048012f2b49212ca..4c083abce20d08f48c12e359770d2c4947fc371f 100644
--- a/sflphone-common/src/audio/codecs/alaw.cpp
+++ b/sflphone-common/src/audio/codecs/alaw.cpp
@@ -1,5 +1,5 @@
-/**
- * Copyright (C) 2004-2005 Savoir-Faire Linux inc.
+/*
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Yan Morin <yan.morin@savoirfairelinux.com>
* Author: Laurielle Lea <laurielle.lea@savoirfairelinux.com>
*
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include "../common.h"
diff --git a/sflphone-common/src/audio/codecs/audiocodec.h b/sflphone-common/src/audio/codecs/audiocodec.h
index 1487fb465dce56cd9a5821ba8cd3a4695398adca..d0d299ca8718fb0f153ec1318853c69c49a1f73d 100644
--- a/sflphone-common/src/audio/codecs/audiocodec.h
+++ b/sflphone-common/src/audio/codecs/audiocodec.h
@@ -1,3 +1,35 @@
+/*
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
+ * Author: Alexandre Savard <alexandre.savard@savoirfairelinux.com>
+ *
+ * Motly borrowed from asterisk's sources (Steve Underwood <steveu@coppice.org>)
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
+ */
+
#ifndef _CODEC_AUDIO_H
#define _CODEC_AUDIO_H
diff --git a/sflphone-common/src/audio/codecs/celtcodec.cpp b/sflphone-common/src/audio/codecs/celtcodec.cpp
index 65e7d1a0ea07c35c624cacc2af834b5da2b5e912..b3e31012bcf6bc1d16aaf1ddc4ef2ad04309c008 100644
--- a/sflphone-common/src/audio/codecs/celtcodec.cpp
+++ b/sflphone-common/src/audio/codecs/celtcodec.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2007-2009 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Alexandre Savard <alexandre.savard@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,6 +15,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include "audiocodec.h"
diff --git a/sflphone-common/src/audio/codecs/codecDescriptor.cpp b/sflphone-common/src/audio/codecs/codecDescriptor.cpp
index 0ca263763ecca44841f9d5f174e74df7aa5f2fc7..268a6010d780dac542d7e3ceaa63e78759b6d994 100644
--- a/sflphone-common/src/audio/codecs/codecDescriptor.cpp
+++ b/sflphone-common/src/audio/codecs/codecDescriptor.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2004-2007 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Yan Morin <yan.morin@savoirfairelinux.com>
* Author: Laurielle Lea <laurielle.lea@savoirfairelinux.com>
* Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
@@ -18,6 +18,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <iostream>
diff --git a/sflphone-common/src/audio/codecs/codecDescriptor.h b/sflphone-common/src/audio/codecs/codecDescriptor.h
index 437d39d0bc7aa2882b8d1d414f90304a068e0514..9b5b1ea126f3e43b07a3679094d49b0a63af2d21 100644
--- a/sflphone-common/src/audio/codecs/codecDescriptor.h
+++ b/sflphone-common/src/audio/codecs/codecDescriptor.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2004-2008 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Yan Morin <yan.morin@savoirfairelinux.com>
* Author: Laurielle Lea <laurielle.lea@savoirfairelinux.com>
* Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
@@ -17,6 +17,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __CODEC_DESCRIPTOR_H__
diff --git a/sflphone-common/src/audio/codecs/g722.cpp b/sflphone-common/src/audio/codecs/g722.cpp
index 8118b5757e7b330b9271252bcfac53abebab0e6a..bde8cabae927a90f65d8949ece847930e73ec0b0 100644
--- a/sflphone-common/src/audio/codecs/g722.cpp
+++ b/sflphone-common/src/audio/codecs/g722.cpp
@@ -1,5 +1,5 @@
-/**
- * Copyright (C) 2009 Savoir-Faire Linux inc.
+/*
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Alexandre Savard <alexandre.savard@savoirfairelinux.com>
*
* Motly borrowed from asterisk's sources (Steve Underwood <steveu@coppice.org>)
@@ -17,7 +17,18 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- **/
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
+ */
diff --git a/sflphone-common/src/audio/codecs/g722.h b/sflphone-common/src/audio/codecs/g722.h
index 4df3334c65b2a8a2d522758faaade819f1933056..e4dcba29f55566103b7f4a3f8c3f3e23246bb594 100644
--- a/sflphone-common/src/audio/codecs/g722.h
+++ b/sflphone-common/src/audio/codecs/g722.h
@@ -1,5 +1,5 @@
-/**
- * Copyright (C) 2009 Savoir-Faire Linux inc.
+/*
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Alexandre Savard <alexandre.savard@savoirfairelinux.com>
*
* Motly borrowed from asterisk's sources (Steve Underwood <steveu@coppice.org>)
@@ -17,7 +17,18 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- **/
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
+ */
diff --git a/sflphone-common/src/audio/codecs/gsmcodec.cpp b/sflphone-common/src/audio/codecs/gsmcodec.cpp
index 9116d76a94a713e8ac7be356902a358b5b6c9386..fef1d7a2c42943fbee8115ef0624ca9b609bae21 100644
--- a/sflphone-common/src/audio/codecs/gsmcodec.cpp
+++ b/sflphone-common/src/audio/codecs/gsmcodec.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2004-2005-2006 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Yan Morin <yan.morin@savoirfairelinux.com>
* Author: Laurielle Lea <laurielle.lea@savoirfairelinux.com>
*
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
diff --git a/sflphone-common/src/audio/codecs/speexcodec_nb.cpp b/sflphone-common/src/audio/codecs/speexcodec_nb.cpp
index f06f5e43f899246f358b6129a981b95874126001..92cd12ed83f2d01c93d5d6eef11e6c4e641b6fd0 100644
--- a/sflphone-common/src/audio/codecs/speexcodec_nb.cpp
+++ b/sflphone-common/src/audio/codecs/speexcodec_nb.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2007-2009 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Alexandre Savard <alexandre.savard@savoirfairelinux.com>
* Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
*
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include "audiocodec.h"
diff --git a/sflphone-common/src/audio/codecs/speexcodec_ub.cpp b/sflphone-common/src/audio/codecs/speexcodec_ub.cpp
index 01fb49b242f37fd94fff738ba27f0080348039be..84be794ecaa2940080a83943eec6fb0ad5271d13 100644
--- a/sflphone-common/src/audio/codecs/speexcodec_ub.cpp
+++ b/sflphone-common/src/audio/codecs/speexcodec_ub.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2007-2009 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Alexandre Savard <alexandre.savard@savoirfairelinux.com>
* Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
*
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include "audiocodec.h"
diff --git a/sflphone-common/src/audio/codecs/speexcodec_wb.cpp b/sflphone-common/src/audio/codecs/speexcodec_wb.cpp
index f3ff803ff0a7e4dc4dc766567adc9a07eafaa6e0..19f9da9c67398f836d523e72161e43a8e98e539b 100644
--- a/sflphone-common/src/audio/codecs/speexcodec_wb.cpp
+++ b/sflphone-common/src/audio/codecs/speexcodec_wb.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2007-2009 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Alexandre Savard <alexandre.savard@savoirfairelinux.com>
* Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
*
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include "audiocodec.h"
diff --git a/sflphone-common/src/audio/codecs/ulaw.cpp b/sflphone-common/src/audio/codecs/ulaw.cpp
index 9b619c31eccf80b1e6b946c08a911c4759bfa911..37d5fd2df8b88f06089937e546fae2a4b9418ac0 100644
--- a/sflphone-common/src/audio/codecs/ulaw.cpp
+++ b/sflphone-common/src/audio/codecs/ulaw.cpp
@@ -1,5 +1,5 @@
-/**
- * Copyright (C) 2004-2005 Savoir-Faire Linux inc.
+/*
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Yan Morin <yan.morin@savoirfairelinux.com>
* Author: Laurielle Lea <laurielle.lea@savoirfairelinux.com>
*
@@ -16,7 +16,18 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- **/
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
+ */
diff --git a/sflphone-common/src/audio/common.h b/sflphone-common/src/audio/common.h
index 5be3d28e17ef2af2cf2548cc4d4d037e0436f953..6f24a65bd53a50bbede077e18354d2ecbb548b88 100644
--- a/sflphone-common/src/audio/common.h
+++ b/sflphone-common/src/audio/common.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2004-2005 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author:
*
* This program is free software; you can redistribute it and/or modify
@@ -15,6 +15,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
/*
diff --git a/sflphone-common/src/audio/dcblocker.cpp b/sflphone-common/src/audio/dcblocker.cpp
index 4ab4e822c02bba68d410ad459c04558104a14d7c..8973c54513b1758bb8c55de02cb040c5330c428d 100644
--- a/sflphone-common/src/audio/dcblocker.cpp
+++ b/sflphone-common/src/audio/dcblocker.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2009 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Alexandre Savard <alexandre.savard@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,6 +15,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include "dcblocker.h"
diff --git a/sflphone-common/src/audio/dcblocker.h b/sflphone-common/src/audio/dcblocker.h
index 3dd7f35e301fd2f22f17ca7f800884a6c5cf7576..20075566cd5fdd37553e4c142d0e169ed2085375 100644
--- a/sflphone-common/src/audio/dcblocker.h
+++ b/sflphone-common/src/audio/dcblocker.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2009 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Alexandre Savard <alexandre.savard@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,6 +15,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef DCBLOCKER_H
diff --git a/sflphone-common/src/audio/echocancel.cpp b/sflphone-common/src/audio/echocancel.cpp
index 95cb40b22656e678358703242276425d52c91628..d957853560520930b15f8d7c1d147f933baba81f 100644
--- a/sflphone-common/src/audio/echocancel.cpp
+++ b/sflphone-common/src/audio/echocancel.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008 2009 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Alexandre Savard <alexandre.savard@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,6 +15,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include "echocancel.h"
diff --git a/sflphone-common/src/audio/echocancel.h b/sflphone-common/src/audio/echocancel.h
index e122b0cd9122bcf73c0fd118230805852391b9a1..e397f49e22c14cbc0dc19b565d88a9314b30ce12 100644
--- a/sflphone-common/src/audio/echocancel.h
+++ b/sflphone-common/src/audio/echocancel.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008 2009 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Alexandre Savard <alexandre.savard@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,6 +15,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef ECHOCANCEL_H
diff --git a/sflphone-common/src/audio/mainbuffer.cpp b/sflphone-common/src/audio/mainbuffer.cpp
index 817b8692d9a7de387cee69b4d4e3a8607f371ec0..278c620de3348166e66f2e252179c57599c1b433 100644
--- a/sflphone-common/src/audio/mainbuffer.cpp
+++ b/sflphone-common/src/audio/mainbuffer.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2009 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author : Alexandre Savard <alexandre.savard@savoirfairelinux.com>
*
*
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include "mainbuffer.h"
diff --git a/sflphone-common/src/audio/mainbuffer.h b/sflphone-common/src/audio/mainbuffer.h
index b3d9975b3379ac72779895e42e610249c6cc59b7..402fe84d6d745b172876db958106f29a094104d3 100644
--- a/sflphone-common/src/audio/mainbuffer.h
+++ b/sflphone-common/src/audio/mainbuffer.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2004-2005 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author : Alexandre Savard <alexandre.savard@savoirfairelinux.com>
*
*
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __MAIN_BUFFER__
diff --git a/sflphone-common/src/audio/pulseaudio/audiostream.cpp b/sflphone-common/src/audio/pulseaudio/audiostream.cpp
index 404f482b190d9ad36b630115dcb6c4092967ae7f..693551964b9db64fc6fa8ecc8fa9aa2e7568beca 100644
--- a/sflphone-common/src/audio/pulseaudio/audiostream.cpp
+++ b/sflphone-common/src/audio/pulseaudio/audiostream.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,6 +15,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <audiostream.h>
diff --git a/sflphone-common/src/audio/pulseaudio/audiostream.h b/sflphone-common/src/audio/pulseaudio/audiostream.h
index 14f769d465cd57f73eb36baa95f01a7a7e12150a..20e199bf293134a18402189e22c9c1de013d4313 100644
--- a/sflphone-common/src/audio/pulseaudio/audiostream.h
+++ b/sflphone-common/src/audio/pulseaudio/audiostream.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,6 +15,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef _AUDIO_STREAM_H
diff --git a/sflphone-common/src/audio/pulseaudio/pulselayer.cpp b/sflphone-common/src/audio/pulseaudio/pulselayer.cpp
index 6aae59c0fe75e32eeb503cbb711aa1dfdc577b9b..16cf22bb1ded8750ea134b198068b29a85aad69e 100644
--- a/sflphone-common/src/audio/pulseaudio/pulselayer.cpp
+++ b/sflphone-common/src/audio/pulseaudio/pulselayer.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
* Author: Alexandre Savard <alexandre.savard@savoirfairelinux.com>
*
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include "pulselayer.h"
diff --git a/sflphone-common/src/audio/pulseaudio/pulselayer.h b/sflphone-common/src/audio/pulseaudio/pulselayer.h
index ee02cf8f3da56b443803a83d185852fc773f633f..b903cf72d121870404be4138eb46763576d0b5e9 100644
--- a/sflphone-common/src/audio/pulseaudio/pulselayer.h
+++ b/sflphone-common/src/audio/pulseaudio/pulselayer.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
* Author: Alexandre Savard <alexandre.savard@savoirfairelinux.com>
*
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef _PULSE_LAYER_H
diff --git a/sflphone-common/src/audio/recordable.cpp b/sflphone-common/src/audio/recordable.cpp
index 69e2d7d773caae411ceb74a3693ab690c8554c3e..f8044c12a4f7376cd34851cc54c04a42393877f6 100644
--- a/sflphone-common/src/audio/recordable.cpp
+++ b/sflphone-common/src/audio/recordable.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2004-2008 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Alexandre Savard <alexandre.savard@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -14,6 +14,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include "recordable.h"
diff --git a/sflphone-common/src/audio/recordable.h b/sflphone-common/src/audio/recordable.h
index c0e261327075a3754ca1f61e650b351c192a2b67..8ab5281cc9fe0509b8e33876bbf47455ecf32464 100644
--- a/sflphone-common/src/audio/recordable.h
+++ b/sflphone-common/src/audio/recordable.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2004-2008 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Alexandre Savard <alexandre.savard@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -14,6 +14,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef RECORDABLE_H
diff --git a/sflphone-common/src/audio/ringbuffer.cpp b/sflphone-common/src/audio/ringbuffer.cpp
index 69c1f5e7226979badeaf219f757431d3a5f07eaa..c38b4c2212018afe37a8b2aa54fac577a2de4e88 100644
--- a/sflphone-common/src/audio/ringbuffer.cpp
+++ b/sflphone-common/src/audio/ringbuffer.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2004, 2005, 2006, 2009Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Alexandre Savard <alexandre.savard@savoirfairelinux.com>
* Author: Yan Morin <yan.morin@savoirfairelinux.com>
* Author: Laurielle Lea <laurielle.lea@savoirfairelinux.com>
@@ -19,6 +19,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <assert.h>
diff --git a/sflphone-common/src/audio/ringbuffer.h b/sflphone-common/src/audio/ringbuffer.h
index c7b8d7b194f4a4c9cfd0c085b5ab6e4677e911ba..6d5ad7d29e12a7d73a45cc0aaf0f54be486c8475 100644
--- a/sflphone-common/src/audio/ringbuffer.h
+++ b/sflphone-common/src/audio/ringbuffer.h
@@ -1,21 +1,19 @@
/*
- * Copyright (C) 2004-2009 Savoir-Faire Linux inc.
+ * Copyright (C) 2007 Savoir-Faire Linux inc.
* Author: Yan Morin <yan.morin@savoirfairelinux.com>
* Author: Laurielle Lea <laurielle.lea@savoirfairelinux.com>
* Author: Alexandre Savard <alexandre.savard@savoirfairelinux.com>
- *
- * Portions Copyright (C) Dominic Mazzoni (Audacity)
- *
+ *
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
diff --git a/sflphone-common/src/audio/samplerateconverter.cpp b/sflphone-common/src/audio/samplerateconverter.cpp
index ba68515756e811546ebd41777766320172289b71..320d70b5cd1396dc331267993d66230de828e45f 100644
--- a/sflphone-common/src/audio/samplerateconverter.cpp
+++ b/sflphone-common/src/audio/samplerateconverter.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -14,6 +14,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include "samplerateconverter.h"
diff --git a/sflphone-common/src/audio/samplerateconverter.h b/sflphone-common/src/audio/samplerateconverter.h
index b018fd862acccc79c9e1e4b6dda49405950df743..3a20105fae5f5303bc940ae19a5c1e8dbb72a8e0 100644
--- a/sflphone-common/src/audio/samplerateconverter.h
+++ b/sflphone-common/src/audio/samplerateconverter.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -14,6 +14,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef _SAMPLE_RATE_H
diff --git a/sflphone-common/src/audio/sound/audiofile.cpp b/sflphone-common/src/audio/sound/audiofile.cpp
index f11b43cbe634026c17109769bd71f6fff15ad5f9..97c0d49c88202db677bf2c93baff03407f5465f3 100644
--- a/sflphone-common/src/audio/sound/audiofile.cpp
+++ b/sflphone-common/src/audio/sound/audiofile.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2005-2007 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Yan Morin <yan.morin@savoirfairelinux.com>
*
* Inspired by tonegenerator of
@@ -19,6 +19,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include "audiofile.h"
#include "audio/codecs/codecDescriptor.h"
diff --git a/sflphone-common/src/audio/sound/audiofile.h b/sflphone-common/src/audio/sound/audiofile.h
index 44357210116c3b40875cf7f1d2bac59e0a652b3c..3b788341e670deaf70874ea5a7a14af28023167a 100644
--- a/sflphone-common/src/audio/sound/audiofile.h
+++ b/sflphone-common/src/audio/sound/audiofile.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2005-2007 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Yan Morin <yan.morin@savoirfairelinux.com>
*
* Inspired by tonegenerator of
@@ -19,6 +19,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __AUDIOFILE_H__
#define __AUDIOFILE_H__
diff --git a/sflphone-common/src/audio/sound/dtmf.cpp b/sflphone-common/src/audio/sound/dtmf.cpp
index 22fc94b952947b9fafada8642cc341504500bc5f..c833fbc9711dd68c66a841d0362beb6fe011571d 100644
--- a/sflphone-common/src/audio/sound/dtmf.cpp
+++ b/sflphone-common/src/audio/sound/dtmf.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2004-2006 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author : Yan Morin <yan.morin@savoirfairelinux.com>
* Author : Laurielle Lea <laurielle.lea@savoirfairelinux.com>
*
@@ -19,6 +19,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include "dtmf.h"
diff --git a/sflphone-common/src/audio/sound/dtmf.h b/sflphone-common/src/audio/sound/dtmf.h
index 9f375b2e27209b7e2b66997e90125c5d72dd563c..155eca3a412d02457810ebf050a80644468378dd 100644
--- a/sflphone-common/src/audio/sound/dtmf.h
+++ b/sflphone-common/src/audio/sound/dtmf.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2004-2005-2006 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author : Yan Morin <yan.morin@savoirfairelinux.com>
* Author: Laurielle Lea <laurielle.lea@savoirfairelinux.com>
*
@@ -19,6 +19,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __DTMF_H_
diff --git a/sflphone-common/src/audio/sound/dtmfgenerator.cpp b/sflphone-common/src/audio/sound/dtmfgenerator.cpp
index a88c7000a04ef4af48c41f455588648966210502..f149d6b445e5f034ba293eb90e179caa1d0e00e4 100644
--- a/sflphone-common/src/audio/sound/dtmfgenerator.cpp
+++ b/sflphone-common/src/audio/sound/dtmfgenerator.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2004-2005 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Yan Morin <yan.morin@savoirfairelinux.com>
* Author: Laurielle Lea <laurielle.lea@savoirfairelinux.com>
*
@@ -20,6 +20,17 @@
* Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
* MA 02111-1307, USA.
*
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <math.h>
diff --git a/sflphone-common/src/audio/sound/dtmfgenerator.h b/sflphone-common/src/audio/sound/dtmfgenerator.h
index a4bed7498389af90048c89732ad78155f06aa9f7..5fa095f0fc0edff600a5171f8300e4624575cd3e 100644
--- a/sflphone-common/src/audio/sound/dtmfgenerator.h
+++ b/sflphone-common/src/audio/sound/dtmfgenerator.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2004-2006 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Yan Morin <yan.morin@savoirfairelinux.com>
* Author: Laurielle Lea <laurielle.lea@savoirfairelinux.com>
*
@@ -20,6 +20,17 @@
* Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
* MA 02111-1307, USA.
*
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef DTMFGENERATOR_H
diff --git a/sflphone-common/src/audio/sound/tone.cpp b/sflphone-common/src/audio/sound/tone.cpp
index 7f60f1ecca749103c8e42fe94f92231f9675677d..aaff9fa4f411278d18fb42144585b4132df63d0e 100644
--- a/sflphone-common/src/audio/sound/tone.cpp
+++ b/sflphone-common/src/audio/sound/tone.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2005, 2006 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Yan Morin <yan.morin@savoirfairelinux.com>
*
* Inspired by tonegenerator of
@@ -19,6 +19,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
/*
* YM: 2006-11-15: changes unsigned int to std::string::size_type, thanks to Pierre Pomes (AMD64 compilation)
diff --git a/sflphone-common/src/audio/sound/tone.h b/sflphone-common/src/audio/sound/tone.h
index 94be60a0b8ecbe4a9b23465dfeec310231d2eedc..cc813603c7df5f8eba10a2203137e6d86bc40e4e 100644
--- a/sflphone-common/src/audio/sound/tone.h
+++ b/sflphone-common/src/audio/sound/tone.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2005-2006 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Yan Morin <yan.morin@savoirfairelinux.com>
*
* Inspired by tonegenerator of
@@ -18,6 +18,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __TONE_H__
#define __TONE_H__
diff --git a/sflphone-common/src/audio/sound/tonelist.cpp b/sflphone-common/src/audio/sound/tonelist.cpp
index d28d3a5520006975b78043ad6a6d57ba30b9a331..0bac7f0113dffb925793c1ed36ddb5b42f562cef 100644
--- a/sflphone-common/src/audio/sound/tonelist.cpp
+++ b/sflphone-common/src/audio/sound/tonelist.cpp
@@ -1,5 +1,5 @@
-/**
- * Copyright (C) 2005 Savoir-Faire Linux inc.
+/*
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Yan Morin <yan.morin@savoirfairelinux.com>
*
* Inspired by tonegenerator of
@@ -18,6 +18,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include "tonelist.h"
diff --git a/sflphone-common/src/audio/sound/tonelist.h b/sflphone-common/src/audio/sound/tonelist.h
index 849af15477a3d18e0d8f906bb324769fe7e32d4f..41c9e5f48c38c26995b701f3f84d2642e3d6dfbc 100644
--- a/sflphone-common/src/audio/sound/tonelist.h
+++ b/sflphone-common/src/audio/sound/tonelist.h
@@ -1,5 +1,5 @@
-/**
- * Copyright (C) 2005 Savoir-Faire Linux inc.
+/*
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Yan Morin <yan.morin@savoirfairelinux.com>
*
* Inspired by tonegenerator of
@@ -18,7 +18,19 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
+
#ifndef __TONELIST_H__
#define __TONELIST_H__
diff --git a/sflphone-common/src/call.cpp b/sflphone-common/src/call.cpp
index 95f69605224ced9ccf54e88389adaec43f70e7b0..93e71226af15973500be6978febde563a6946d85 100644
--- a/sflphone-common/src/call.cpp
+++ b/sflphone-common/src/call.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2004-2006 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Yan Morin <yan.morin@savoirfairelinux.com>
* Author : Laurielle Lea <laurielle.lea@savoirfairelinux.com>
*
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include "call.h"
#include "manager.h"
diff --git a/sflphone-common/src/call.h b/sflphone-common/src/call.h
index 5d89931af7ba4e8be18c45c03e64b8c70cce4ce9..6fcc87fd2f9908fb6b5bdbb744d80e927618a0be 100644
--- a/sflphone-common/src/call.h
+++ b/sflphone-common/src/call.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2004-2009 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
* Author: Yan Morin <yan.morin@savoirfairelinux.com>
* Author : Laurielle Lea <laurielle.lea@savoirfairelinux.com>
@@ -17,6 +17,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef CALL_H
#define CALL_H
diff --git a/sflphone-common/src/conference.cpp b/sflphone-common/src/conference.cpp
index b2e6c51c750b7d7cdd947763b0e0a29bf4ca721e..d93cf8a0a486b8a97ac08e233e04f02462b096d3 100644
--- a/sflphone-common/src/conference.cpp
+++ b/sflphone-common/src/conference.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2009 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author : Alexandre Savard <alexandre.savard@savoirfairelinux.com>
*
*
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <sstream>
diff --git a/sflphone-common/src/conference.h b/sflphone-common/src/conference.h
index 733b338add7edac43c790bb7a88107a73bf5c5ca..a20a9a25842faf1ff97f13048f4a98d9b9902468 100644
--- a/sflphone-common/src/conference.h
+++ b/sflphone-common/src/conference.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2009 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Alexandre Savard <alexandre.savard@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,6 +15,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef CONFERENCE_H
#define CONFERENCE_H
diff --git a/sflphone-common/src/config/config.cpp b/sflphone-common/src/config/config.cpp
index 50e531f76cc803a14c2ed99a7e3a8ea754f6d773..83bba767b1e7ff66891c2836485f68ddc7f8f966 100644
--- a/sflphone-common/src/config/config.cpp
+++ b/sflphone-common/src/config/config.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2005-2007 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Alexandre Bourget <alexandre.bourget@savoirfairelinux.com>
* Author: Yan Morin <yan.morin@savoirfairelinux.com>
*
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include "config.h"
diff --git a/sflphone-common/src/config/config.h b/sflphone-common/src/config/config.h
index d265dbb5859e403689192550694e2d4768b33435..c304045f60d37ec5378eede250e68d59eb866dae 100644
--- a/sflphone-common/src/config/config.h
+++ b/sflphone-common/src/config/config.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2005-2007 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Alexandre Bourget <alexandre.bourget@savoirfairelinux.com>
* Author: Yan Morin <yan.morin@savoirfairelinux.com>
*
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __CONFIG_CONFIG_H_
diff --git a/sflphone-common/src/dbus/callmanager.cpp b/sflphone-common/src/dbus/callmanager.cpp
index f4e4eef5da6df5e4164e15731db13c5c3382a295..5662b4640408d9c59180242f98385f3b938c1a6c 100644
--- a/sflphone-common/src/dbus/callmanager.cpp
+++ b/sflphone-common/src/dbus/callmanager.cpp
@@ -1,6 +1,5 @@
-
/*
- * Copyright (C) 2007 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Pierre-Luc Beaudoin <pierre-luc.beaudoin@savoirfairelinux.com>
* Author: Alexandre Bourget <alexandre.bourget@savoirfairelinux.com>
*
@@ -17,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <vector>
diff --git a/sflphone-common/src/dbus/callmanager.h b/sflphone-common/src/dbus/callmanager.h
index 8232b765a9def8e0cd10c5c0a93ff804573b3470..950d12a98a2ae67f6b16bf401dcf4f38ee0494ee 100644
--- a/sflphone-common/src/dbus/callmanager.h
+++ b/sflphone-common/src/dbus/callmanager.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2007 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Pierre-Luc Beaudoin <pierre-luc.beaudoin@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,6 +15,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __SFL_CALLMANAGER_H__
diff --git a/sflphone-common/src/dbus/configurationmanager.cpp b/sflphone-common/src/dbus/configurationmanager.cpp
index c7d309b3a7b90de5d5a181ebabda8c02a4f0eb0c..b928dd36554fbd15000f639d1b3a93364716c58f 100644
--- a/sflphone-common/src/dbus/configurationmanager.cpp
+++ b/sflphone-common/src/dbus/configurationmanager.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2007 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Pierre-Luc Beaudoin <pierre-luc.beaudoin@savoirfairelinux.com>
* Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
* Author: Guillaume Carmel-Archambault <guillaume.carmel-archambault@savoirfairelinux.com>
@@ -17,6 +17,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <global.h>
diff --git a/sflphone-common/src/dbus/configurationmanager.h b/sflphone-common/src/dbus/configurationmanager.h
index 17ea89be6dbfbcea45c4233884ace5ec92e292ff..cf711cf907c06e13daf27adc75e2429871b8c5c6 100644
--- a/sflphone-common/src/dbus/configurationmanager.h
+++ b/sflphone-common/src/dbus/configurationmanager.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2007 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Pierre-Luc Beaudoin <pierre-luc.beaudoin@savoirfairelinux.com>
* Author: Alexandre Bourget <alexandre.bourget@savoirfairelinux.com>
* Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
@@ -18,6 +18,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef CONFIGURATIONMANAGER_H
diff --git a/sflphone-common/src/dbus/contactmanager.cpp b/sflphone-common/src/dbus/contactmanager.cpp
index 2764d30e56ff2b75382a45e401b2f3a113ad5db9..8474f6eac89acdef801631749cef3f4eb343e00d 100644
--- a/sflphone-common/src/dbus/contactmanager.cpp
+++ b/sflphone-common/src/dbus/contactmanager.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Guillaume Carmel-Archambault <guillaume.carmel-archambault@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,6 +15,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <contactmanager.h>
diff --git a/sflphone-common/src/dbus/contactmanager.h b/sflphone-common/src/dbus/contactmanager.h
index 705a10bb665b40d30961019a6ba46f08731b0776..5611b41f9b8b0b90438955a0e332edcf3fa64574 100644
--- a/sflphone-common/src/dbus/contactmanager.h
+++ b/sflphone-common/src/dbus/contactmanager.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Guillaume Carmel-Archambault <guillaume.carmel-archambault@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,6 +15,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef CONTACTMANAGER_H
diff --git a/sflphone-common/src/dbus/dbusmanager.h b/sflphone-common/src/dbus/dbusmanager.h
index e8beb6cebf623256d2a33ffaacf4539e0ea87be8..47a36d304fd5d1f7af3b0493f301c36913708811 100644
--- a/sflphone-common/src/dbus/dbusmanager.h
+++ b/sflphone-common/src/dbus/dbusmanager.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2007 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Pierre-Luc Beaudoin <pierre-luc.beaudoin@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,6 +15,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __DBUSMANAGERSINGLETON_H__
diff --git a/sflphone-common/src/dbus/dbusmanagerimpl.cpp b/sflphone-common/src/dbus/dbusmanagerimpl.cpp
index ef0b342aac91584610dbc9fcb5710517dbc290a4..1c70b42df81d09bb5d7bfd4820d57ebfcdb22e9c 100644
--- a/sflphone-common/src/dbus/dbusmanagerimpl.cpp
+++ b/sflphone-common/src/dbus/dbusmanagerimpl.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2007 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Pierre-Luc Beaudoin <pierre-luc.beaudoin@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,6 +15,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <dbusmanagerimpl.h>
diff --git a/sflphone-common/src/dbus/dbusmanagerimpl.h b/sflphone-common/src/dbus/dbusmanagerimpl.h
index c68d440fa375f9951f877c8d44443bc7a24b451c..916ae5a407aabd158bb5a92345a9e47a23313f0b 100644
--- a/sflphone-common/src/dbus/dbusmanagerimpl.h
+++ b/sflphone-common/src/dbus/dbusmanagerimpl.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2007 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Pierre-Luc Beaudoin <pierre-luc.beaudoin@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,6 +15,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __DBUSMANAGERIMPL_H__
diff --git a/sflphone-common/src/dbus/instance.cpp b/sflphone-common/src/dbus/instance.cpp
index e70322d6fc19c5426cd8037f4942a4c975a3a616..5813332ffbe071d06d9ccc95c1ccd3423b048cc9 100644
--- a/sflphone-common/src/dbus/instance.cpp
+++ b/sflphone-common/src/dbus/instance.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2007 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Pierre-Luc Beaudoin <pierre-luc.beaudoin@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,6 +15,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <global.h>
#include <instance.h>
diff --git a/sflphone-common/src/dbus/instance.h b/sflphone-common/src/dbus/instance.h
index 9a81caafc89e04874277612259c6308e59d9b6cb..d963e5d1319860a7d137edba0c4081dc9dcc9eac 100644
--- a/sflphone-common/src/dbus/instance.h
+++ b/sflphone-common/src/dbus/instance.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2007 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Pierre-Luc Beaudoin <pierre-luc.beaudoin@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,6 +15,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef INSTANCE_H
diff --git a/sflphone-common/src/dbus/networkmanager.cpp b/sflphone-common/src/dbus/networkmanager.cpp
index 4b1f0b2a50c48e66beaccba0270e0175ae5f17a4..2e106167591b267648886a046fa168819d471d4a 100644
--- a/sflphone-common/src/dbus/networkmanager.cpp
+++ b/sflphone-common/src/dbus/networkmanager.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2004-2009 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Julien Bonjean <julien.bonjean@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,6 +15,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifdef USE_NETWORKMANAGER
diff --git a/sflphone-common/src/dbus/networkmanager.h b/sflphone-common/src/dbus/networkmanager.h
index bf18e15c6319a5bd66d9bb271ee333749395393c..3754669751e101a6038130cb7d4d93c29b7219d7 100644
--- a/sflphone-common/src/dbus/networkmanager.h
+++ b/sflphone-common/src/dbus/networkmanager.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2004-2009 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Julien Bonjean <julien.bonjean@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,6 +15,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef NETWORKMANAGER_H
diff --git a/sflphone-common/src/eventthread.cpp b/sflphone-common/src/eventthread.cpp
index 9ed09633fc2598db03f64fa9f1c3d5f885f7b1bd..cc16b5e77f45e448e13455b5ed99853c9b17fcda 100644
--- a/sflphone-common/src/eventthread.cpp
+++ b/sflphone-common/src/eventthread.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2009 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,6 +15,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include "eventthread.h"
diff --git a/sflphone-common/src/eventthread.h b/sflphone-common/src/eventthread.h
index 0d631ef066254593e976e1837b1f1e54c2df7594..aed9f5b5159052acb9cb776c94948798cf3cb384 100644
--- a/sflphone-common/src/eventthread.h
+++ b/sflphone-common/src/eventthread.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2009 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,6 +15,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __EVENT_THREAD_H__
diff --git a/sflphone-common/src/global.h b/sflphone-common/src/global.h
index b9812b725551257ea7754c4e5cf61ce75ea8dca2..552616d7851be88197c105e84c062d3c0b2710fc 100644
--- a/sflphone-common/src/global.h
+++ b/sflphone-common/src/global.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2004-2008 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
* Author: Yan Morin <yan.morin@savoirfairelinux.com>
* Author: Laurielle Lea <laurielle.lea@savoirfairelinux.com>
@@ -17,6 +17,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __GLOBAL_H__
@@ -33,7 +44,7 @@
#include <vector>
#include "logger.h"
-#define SFLPHONED_VERSION "0.9.8~rc1" /** Version number */
+#define SFLPHONED_VERSION "0.9.8" /** Version number */
#define HOMEDIR (getenv ("HOME")) /** Home directory */
#define XDG_DATA_HOME (getenv ("XDG_DATA_HOME"))
diff --git a/sflphone-common/src/history/historyitem.cpp b/sflphone-common/src/history/historyitem.cpp
index d8d12d7232d90b0f26b8159118e0fa7232a5ff58..11f47ceb2c2e9cc663eb51a6764b85e6876e6f87 100644
--- a/sflphone-common/src/history/historyitem.cpp
+++ b/sflphone-common/src/history/historyitem.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2009 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
*
* Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
*
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <historyitem.h>
diff --git a/sflphone-common/src/history/historyitem.h b/sflphone-common/src/history/historyitem.h
index 1d429a26e745cd2590561517b20dd24e94ef097d..55b12cb5b8785516cbb77f46b43570018a037ff2 100644
--- a/sflphone-common/src/history/historyitem.h
+++ b/sflphone-common/src/history/historyitem.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2009 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
*
* Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
*
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef _HISTORY_ITEM
diff --git a/sflphone-common/src/history/historymanager.cpp b/sflphone-common/src/history/historymanager.cpp
index ac5188c30b6e876ca35acc8ee7d788df204c7e60..54fa6d1eb614b40a17f35f645f5b5e02b53f6ac4 100644
--- a/sflphone-common/src/history/historymanager.cpp
+++ b/sflphone-common/src/history/historymanager.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2009 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
*
* Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
*
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <historymanager.h>
diff --git a/sflphone-common/src/history/historymanager.h b/sflphone-common/src/history/historymanager.h
index f0726d79b8ca1352a79d55d8cce96af9f03bb588..e8966dfeb200e832dd3819df842843925155a879 100644
--- a/sflphone-common/src/history/historymanager.h
+++ b/sflphone-common/src/history/historymanager.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2009 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
*
* Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
*
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef _HISTORY_MANAGER
diff --git a/sflphone-common/src/hooks/urlhook.cpp b/sflphone-common/src/hooks/urlhook.cpp
index 3538602fb773a926d74162f49e9b8e6ff8942fe5..f74aa00ef0794c41f15e84bb96d2040b5e476f40 100644
--- a/sflphone-common/src/hooks/urlhook.cpp
+++ b/sflphone-common/src/hooks/urlhook.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2009 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,6 +15,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include "urlhook.h"
diff --git a/sflphone-common/src/hooks/urlhook.h b/sflphone-common/src/hooks/urlhook.h
index 9b3dffb64edce5f3e1642d6bb8c67506439cf8a2..49208656063665caf781c681d8247c368e9e5e3b 100644
--- a/sflphone-common/src/hooks/urlhook.h
+++ b/sflphone-common/src/hooks/urlhook.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2009 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,6 +15,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef URL_HOOK_H
diff --git a/sflphone-common/src/iax/iaxaccount.cpp b/sflphone-common/src/iax/iaxaccount.cpp
index de210fda00b12026e09d891035ff83e2ff8a9424..2c277cb0827ee138efb7e835d4362a188ba7d032 100644
--- a/sflphone-common/src/iax/iaxaccount.cpp
+++ b/sflphone-common/src/iax/iaxaccount.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2006-2009 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
*
* Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
* Author: Alexandre Bourget <alexandre.bourget@savoirfairelinux.com>
@@ -17,6 +17,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include "iaxaccount.h"
diff --git a/sflphone-common/src/iax/iaxaccount.h b/sflphone-common/src/iax/iaxaccount.h
index a8f1092a80bf5e24a06b79ead73ed5e224c878df..929f7af38a8fa391bc154c88fa05f72ce138cbec 100644
--- a/sflphone-common/src/iax/iaxaccount.h
+++ b/sflphone-common/src/iax/iaxaccount.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2006-2009 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Alexandre Bourget <alexandre.bourget@savoirfairelinux.com>
* Author: Yan Morin <yan.morin@savoirfairelinux.com>
*
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef IAXACCOUNT_H
#define IAXACCOUNT_H
diff --git a/sflphone-common/src/iax/iaxcall.cpp b/sflphone-common/src/iax/iaxcall.cpp
index be152908e611ac9411a290615fccfc678568cb2d..7964df857fdf82434c65277334068f0b97d34bf1 100644
--- a/sflphone-common/src/iax/iaxcall.cpp
+++ b/sflphone-common/src/iax/iaxcall.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2006-2007 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Alexandre Bourget <alexandre.bourget@savoirfairelinux.com>
* Author: Yan Morin <yan.morin@savoirfairelinux.com>
*
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include "iaxcall.h"
diff --git a/sflphone-common/src/iax/iaxcall.h b/sflphone-common/src/iax/iaxcall.h
index 12dc670428640ae08f22e922ed1810471ce7ff4e..7ecb1558cacf79ab3e79f6c56276726fd4d24503 100644
--- a/sflphone-common/src/iax/iaxcall.h
+++ b/sflphone-common/src/iax/iaxcall.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2006-2007 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Alexandre Bourget <alexandre.bourget@savoirfairelinux.com>
* Author: Yan Morin <yan.morin@savoirfairelinux.com>
*
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef IAXCALL_H
#define IAXCALL_H
diff --git a/sflphone-common/src/iax/iaxvoiplink.cpp b/sflphone-common/src/iax/iaxvoiplink.cpp
index 9139b07b3be0d76540082bb26f86a85a26fb447b..0649b34df34770174505e3618ddab47c0512aad1 100644
--- a/sflphone-common/src/iax/iaxvoiplink.cpp
+++ b/sflphone-common/src/iax/iaxvoiplink.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2006-2007 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Alexandre Bourget <alexandre.bourget@savoirfairelinux.com>
* Author: Yan Morin <yan.morin@savoirfairelinux.com>
*
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include "iaxvoiplink.h"
#include "iaxcall.h"
diff --git a/sflphone-common/src/iax/iaxvoiplink.h b/sflphone-common/src/iax/iaxvoiplink.h
index d67ef72b3e3302a6801127f5bafd8f69607ca28a..0f61f5958823b218193d838a2c89df133654805b 100644
--- a/sflphone-common/src/iax/iaxvoiplink.h
+++ b/sflphone-common/src/iax/iaxvoiplink.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2006-2007-2008 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
* Author: Alexandre Bourget <alexandre.bourget@savoirfairelinux.com>
* Author: Yan Morin <yan.morin@savoirfairelinux.com>
@@ -17,6 +17,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef IAXVOIPLINK_H
#define IAXVOIPLINK_H
diff --git a/sflphone-common/src/logger.cpp b/sflphone-common/src/logger.cpp
index 08ab98f208b30acbb131f751aa9b8e2080615d3c..9269553817df1e55b73465fba9445a6cb1b64fd3 100644
--- a/sflphone-common/src/logger.cpp
+++ b/sflphone-common/src/logger.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2004-2009 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Julien Bonjean <julien.bonjean@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,6 +15,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include "logger.h"
diff --git a/sflphone-common/src/logger.h b/sflphone-common/src/logger.h
index ec199b21d597969dea82cd0068c471e1f44330cf..7bf8ec75d60e7a0607d6abfbeeda9a17921f92ad 100644
--- a/sflphone-common/src/logger.h
+++ b/sflphone-common/src/logger.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2004-2009 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Julien Bonjean <julien.bonjean@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,6 +15,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __LOGGER_H__
diff --git a/sflphone-common/src/main.cpp b/sflphone-common/src/main.cpp
index 6f2d05cfe73e9dcc393235620bff131986218ed8..aca2e1f1547ccfcf0770eddbd476ccf90b87253b 100644
--- a/sflphone-common/src/main.cpp
+++ b/sflphone-common/src/main.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2004-2007 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Alexandre Bourget <alexandre.bourget@savoirfairelinux.com>
* Author: Yan Morin <yan.morin@savoirfairelinux.com>
* Author: Laurielle Lea <laurielle.lea@savoirfairelinux.com>
@@ -17,6 +17,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <libintl.h>
diff --git a/sflphone-common/src/manager.h b/sflphone-common/src/manager.h
index bd5f3fca2275348fe979868d5475009649880f86..e9324055911b07075cc5ff6420b79b64a5a2c643 100644
--- a/sflphone-common/src/manager.h
+++ b/sflphone-common/src/manager.h
@@ -1,5 +1,5 @@
-/**
- * Copyright (C) 2004-2005 Savoir-Faire Linux inc.
+/*
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author : Jean-Philippe Barrette-LaPierre
* <jean-philippe.barrette-lapierre@savoirfairelinux.com>
*
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef SFLPHONE_MANAGER_H
diff --git a/sflphone-common/src/managerimpl.cpp b/sflphone-common/src/managerimpl.cpp
index f32562d0d155221329780890632ca4b04bfdb8f3..e709a4e04dba59d1daa2d95d90ee56be05163300 100644
--- a/sflphone-common/src/managerimpl.cpp
+++ b/sflphone-common/src/managerimpl.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2004-2007 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Alexandre Bourget <alexandre.bourget@savoirfairelinux.com>
* Author: Yan Morin <yan.morin@savoirfairelinux.com>
* Author: Laurielle Lea <laurielle.lea@savoirfairelinux.com>
@@ -20,6 +20,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include "managerimpl.h"
diff --git a/sflphone-common/src/managerimpl.h b/sflphone-common/src/managerimpl.h
index d23d2f1db139874e3803549565eeb5d60aff03b4..09acea4fd8a40c63d2c2c7f9a472a04b5c67455b 100644
--- a/sflphone-common/src/managerimpl.h
+++ b/sflphone-common/src/managerimpl.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2004-2005 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Yan Morin <yan.morin@savoirfairelinux.com>
* Author: Laurielle Lea <laurielle.lea@savoirfairelinux.com>
* Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
@@ -18,6 +18,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __SFL_MANAGER_H__
diff --git a/sflphone-common/src/managerimpl_registration.cpp b/sflphone-common/src/managerimpl_registration.cpp
index 241a8b4078db80e6450d79f8f6e68f43b4738ba6..552b2eb4568b25771a766a8c9950b38a4e03b3e8 100644
--- a/sflphone-common/src/managerimpl_registration.cpp
+++ b/sflphone-common/src/managerimpl_registration.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2004-2007 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Alexandre Bourget <alexandre.bourget@savoirfairelinux.com>
* Author: Yan Morin <yan.morin@savoirfairelinux.com>
* Author: Laurielle Lea <laurielle.lea@savoirfairelinux.com>
@@ -20,6 +20,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include "managerimpl.h"
diff --git a/sflphone-common/src/numbercleaner.cpp b/sflphone-common/src/numbercleaner.cpp
index b583ca594503a1d16985f713e0500a5e3b44d4ae..cc84b754df4d864e4996c50a31ee67e8f76449fd 100644
--- a/sflphone-common/src/numbercleaner.cpp
+++ b/sflphone-common/src/numbercleaner.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2009 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
*
* Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
*
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include "numbercleaner.h"
diff --git a/sflphone-common/src/numbercleaner.h b/sflphone-common/src/numbercleaner.h
index 02be4bd347c350abc3064c537a8f74d93e968d23..a45192e258841175031339e77fba1b5c43ae0cee 100644
--- a/sflphone-common/src/numbercleaner.h
+++ b/sflphone-common/src/numbercleaner.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2009 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
*
* Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
*
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef _NUMBER_CLEANER_H
diff --git a/sflphone-common/src/observer.cpp b/sflphone-common/src/observer.cpp
index 40ac49de63fae065eec174923baf9437a2c270f9..d1cb8912fb2d235319a9097d9f16d38ed9eadc2e 100644
--- a/sflphone-common/src/observer.cpp
+++ b/sflphone-common/src/observer.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2005-2006 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Yan Morin <yan.morin@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,6 +15,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include "observer.h"
diff --git a/sflphone-common/src/observer.h b/sflphone-common/src/observer.h
index f63b4602ef472f5bde3f5d369db0e028d658eed2..5e778800598a1cbce1815a2ae544589171a0ba7a 100644
--- a/sflphone-common/src/observer.h
+++ b/sflphone-common/src/observer.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2005-2006 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Yan Morin <yan.morin@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,6 +15,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __PATTERN_OBSERVER_H_
diff --git a/sflphone-common/src/plug-in/audiorecorder/audiodsp.cpp b/sflphone-common/src/plug-in/audiorecorder/audiodsp.cpp
index f9b5c014ef5c7c4e5976946afb08ac2df028051c..fb95d1a52cb4302c5daf89413921b9509b0e720b 100644
--- a/sflphone-common/src/plug-in/audiorecorder/audiodsp.cpp
+++ b/sflphone-common/src/plug-in/audiorecorder/audiodsp.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Alexandre Savard <alexandre.savard@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,6 +15,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include "audiodsp.h"
diff --git a/sflphone-common/src/plug-in/audiorecorder/audiodsp.h b/sflphone-common/src/plug-in/audiorecorder/audiodsp.h
index c99093a22011e5655bda8161a9182d84699b5901..bc2279494cb68f422ac02822bd6cb620d233ca77 100644
--- a/sflphone-common/src/plug-in/audiorecorder/audiodsp.h
+++ b/sflphone-common/src/plug-in/audiorecorder/audiodsp.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Alexandre Savard <alexandre.savard@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,6 +15,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef _AUDIO_DSP_H
diff --git a/sflphone-common/src/plug-in/audiorecorder/audiorecord.cpp b/sflphone-common/src/plug-in/audiorecorder/audiorecord.cpp
index f9c7478eee33cdfbc73d23571c754195c1f8d99c..4cc6d1779432412c61772a0a785dc5bfda8c8fcb 100644
--- a/sflphone-common/src/plug-in/audiorecorder/audiorecord.cpp
+++ b/sflphone-common/src/plug-in/audiorecorder/audiorecord.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Alexandre Savard <alexandre.savard@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,6 +15,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include "audiorecord.h"
diff --git a/sflphone-common/src/plug-in/audiorecorder/audiorecord.h b/sflphone-common/src/plug-in/audiorecorder/audiorecord.h
index de61da019c6b24a4ca05df58025deeeeb03ae1ca..de58f9535e86aa7efe31ad1ac98bcd876d01d781 100644
--- a/sflphone-common/src/plug-in/audiorecorder/audiorecord.h
+++ b/sflphone-common/src/plug-in/audiorecorder/audiorecord.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Alexandre Savard <alexandre.savard@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,6 +15,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef _AUDIO_RECORD_H
diff --git a/sflphone-common/src/plug-in/librarymanager.cpp b/sflphone-common/src/plug-in/librarymanager.cpp
index f4fba8683bfd985075e7ede79cba759e535d23eb..b63df59bd31dfc9b7d075fff8e86b1ae81fe8720 100644
--- a/sflphone-common/src/plug-in/librarymanager.cpp
+++ b/sflphone-common/src/plug-in/librarymanager.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2009 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,6 +15,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
diff --git a/sflphone-common/src/plug-in/librarymanager.h b/sflphone-common/src/plug-in/librarymanager.h
index e244d448a1152a46950d4b0ec95e06847eac4ff5..2e94cd5681c3c8dcf7124703ec795ed275eb36e2 100644
--- a/sflphone-common/src/plug-in/librarymanager.h
+++ b/sflphone-common/src/plug-in/librarymanager.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2009 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,6 +15,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef LIBRARY_MANAGER_H
diff --git a/sflphone-common/src/plug-in/plugin.h b/sflphone-common/src/plug-in/plugin.h
index 2769c56c372e22be24334107ef6efdf5bf4e8b31..95a9adcb89027954c968a81b75e1b8b88974c368 100644
--- a/sflphone-common/src/plug-in/plugin.h
+++ b/sflphone-common/src/plug-in/plugin.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2009 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,6 +15,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
diff --git a/sflphone-common/src/plug-in/pluginmanager.cpp b/sflphone-common/src/plug-in/pluginmanager.cpp
index 431f3eb8744bc2ea02b4ed9f37fa1908844abcd4..5584ba2a1212483e99a344dc3ea22c2290d7ec88 100644
--- a/sflphone-common/src/plug-in/pluginmanager.cpp
+++ b/sflphone-common/src/plug-in/pluginmanager.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2009 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,6 +15,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <dirent.h>
diff --git a/sflphone-common/src/plug-in/pluginmanager.h b/sflphone-common/src/plug-in/pluginmanager.h
index 4b3a1869200ce7deaac770d661d360223adbc7b0..a60ee02b3ba86fcb889f1d252ddf709a9437d606 100644
--- a/sflphone-common/src/plug-in/pluginmanager.h
+++ b/sflphone-common/src/plug-in/pluginmanager.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2009 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,6 +15,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef PLUGIN_MANAGER_H
diff --git a/sflphone-common/src/plug-in/test/pluginTest.cpp b/sflphone-common/src/plug-in/test/pluginTest.cpp
index 9bef60f3a4402cda30872d5ee502ba8d68456d65..a1c80a40fdd82b5b5dcc9b043d25e830f855fe43 100644
--- a/sflphone-common/src/plug-in/test/pluginTest.cpp
+++ b/sflphone-common/src/plug-in/test/pluginTest.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2009 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,6 +15,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include "../plugin.h"
diff --git a/sflphone-common/src/sip/Pattern.cpp b/sflphone-common/src/sip/Pattern.cpp
index f925c8db9005e3ad986bbf20f20e4fbc3028d975..89e3efb48a884e740383ff294370797ef6a2502a 100644
--- a/sflphone-common/src/sip/Pattern.cpp
+++ b/sflphone-common/src/sip/Pattern.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2009 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Pierre-Luc Bacon <pierre-luc.bacon@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -14,6 +14,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include "Pattern.h"
diff --git a/sflphone-common/src/sip/Pattern.h b/sflphone-common/src/sip/Pattern.h
index 870ca1b5e8b37189a1f1b4575ec27611890c2df5..a929c655218825eecc3a9f22634731d6712c6cbe 100644
--- a/sflphone-common/src/sip/Pattern.h
+++ b/sflphone-common/src/sip/Pattern.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2009 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Pierre-Luc Bacon <pierre-luc.bacon@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -14,6 +14,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __SFL_PATTERN_H__
#define __SFL_PATTERN_H__
diff --git a/sflphone-common/src/sip/SdesNegotiator.cpp b/sflphone-common/src/sip/SdesNegotiator.cpp
index ef2849bb75f7f58d00403c5333edfc107895d750..5396755b6be1b948629e6cf6e63111f9756c828e 100644
--- a/sflphone-common/src/sip/SdesNegotiator.cpp
+++ b/sflphone-common/src/sip/SdesNegotiator.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2009 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Pierre-Luc Bacon <pierre-luc.bacon@savoirfairelinux.com>
* Author: Alexandre Savard <alexandre.savard@savoirfairelinux.com>
*
@@ -15,6 +15,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include "SdesNegotiator.h"
diff --git a/sflphone-common/src/sip/SdesNegotiator.h b/sflphone-common/src/sip/SdesNegotiator.h
index e0de86de108c0bd01b61e14fd1f657a9e1bf232f..b57b46a16354e2582cdd60f32e23f9298414f676 100644
--- a/sflphone-common/src/sip/SdesNegotiator.h
+++ b/sflphone-common/src/sip/SdesNegotiator.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2009 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Pierre-Luc Bacon <pierre-luc.bacon@savoirfairelinux.com>
* Author: Alexandre Savard <alexandre.savard@savoirfairelinux.com>
*
@@ -15,6 +15,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __SFL_SDES_NEGOTIATOR_H__
#define __SFL_SDES_NEGOTIATOR_H__
diff --git a/sflphone-common/src/sip/sdp.cpp b/sflphone-common/src/sip/sdp.cpp
index 52025485eabe9ee283627bf8e53a2bf6c0d40c7e..d98386916c9f50af296138a35eb7b8d7e0b150a7 100644
--- a/sflphone-common/src/sip/sdp.cpp
+++ b/sflphone-common/src/sip/sdp.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2009 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
*
* Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
* Author: Alexandre Savard <alexandre.savard@savoirfairelinux.com>
@@ -17,6 +17,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include "sdp.h"
diff --git a/sflphone-common/src/sip/sdp.h b/sflphone-common/src/sip/sdp.h
index b823609f4522457aaadbbab8a5763d42b530a1e3..07c1ecfce7a51a309ffbf693c39b194e6777f084 100644
--- a/sflphone-common/src/sip/sdp.h
+++ b/sflphone-common/src/sip/sdp.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2009 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
*
* Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
*
@@ -16,6 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef _SDP_H
diff --git a/sflphone-common/src/sip/sdpmedia.cpp b/sflphone-common/src/sip/sdpmedia.cpp
index eaed9dfda3ee80ca55912baa958bfe9b3d294ce4..95955a51db652bc9ebd92c553589e7d82a563a77 100644
--- a/sflphone-common/src/sip/sdpmedia.cpp
+++ b/sflphone-common/src/sip/sdpmedia.cpp
@@ -1,6 +1,5 @@
/*
- *
- * Copyright (C) 2009 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
*
* Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
*
@@ -16,6 +15,17 @@
*
* You should have received a copy of the GNU General Public License
* along with Sropulpof. If not, see <http:*www.gnu.org*licenses*>.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include "sdpmedia.h"
diff --git a/sflphone-common/src/sip/sdpmedia.h b/sflphone-common/src/sip/sdpmedia.h
index fbeb605aa64784cb59ea21acc59db9a8c45d63d3..96d47e326b424ebb1c75c9298342aec9559b8187 100644
--- a/sflphone-common/src/sip/sdpmedia.h
+++ b/sflphone-common/src/sip/sdpmedia.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2009 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
*
* Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
*
@@ -15,6 +15,17 @@
*
* You should have received a copy of the GNU General Public License
* along with Sropulpof. If not, see <http:*www.gnu.org*licenses*>.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef _SDP_MEDIA
diff --git a/sflphone-common/src/sip/sipaccount.cpp b/sflphone-common/src/sip/sipaccount.cpp
index a66066796eff4d87c6a20a0393efd5aff57fb8ad..97318b47928130283ed86f44dcd0dd056f1edbc8 100644
--- a/sflphone-common/src/sip/sipaccount.cpp
+++ b/sflphone-common/src/sip/sipaccount.cpp
@@ -1,5 +1,5 @@
/*
-* Copyright (C) 2006-2009 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
*
* Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
* Author: Pierre-Luc Bacon <pierre-luc.bacon@savoirfairelinux.com>
@@ -17,6 +17,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include "sipaccount.h"
diff --git a/sflphone-common/src/sip/sipaccount.h b/sflphone-common/src/sip/sipaccount.h
index 7bc4f890cfbfebdc2c16ec6a14e018881e03a4ee..51fb6de0c451eaffd5642f2b4824f15384ab14e0 100644
--- a/sflphone-common/src/sip/sipaccount.h
+++ b/sflphone-common/src/sip/sipaccount.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2006-2009 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
*
* Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
* Author: Alexandre Bourget <alexandre.bourget@savoirfairelinux.com>
@@ -19,6 +19,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef SIPACCOUNT_H
diff --git a/sflphone-common/src/sip/sipcall.cpp b/sflphone-common/src/sip/sipcall.cpp
index 9ed7f7a90e42b3651fdd67fddde9972fbd9a7565..78595928dfc0665feba6b6f4b06e8286e2b89910 100644
--- a/sflphone-common/src/sip/sipcall.cpp
+++ b/sflphone-common/src/sip/sipcall.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2004-2007 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
* Author: Alexandre Bourget <alexandre.bourget@savoirfairelinux.com>
* Author: Yan Morin <yan.morin@savoirfairelinux.com>
@@ -18,6 +18,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include "sipcall.h"
diff --git a/sflphone-common/src/sip/sipcall.h b/sflphone-common/src/sip/sipcall.h
index 7d14936729055c65cbd348263fcac35b6fe620f9..46af03ad2d046c2338d4f8fd404b90103b249c5a 100644
--- a/sflphone-common/src/sip/sipcall.h
+++ b/sflphone-common/src/sip/sipcall.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2004-2007 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Alexandre Bourget <alexandre.bourget@savoirfairelinux.com>
* Author: Yan Morin <yan.morin@savoirfairelinux.com>
* Author : Laurielle Lea <laurielle.lea@savoirfairelinux.com>
@@ -17,6 +17,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef SIPCALL_H
#define SIPCALL_H
diff --git a/sflphone-common/src/sip/sipvoiplink.cpp b/sflphone-common/src/sip/sipvoiplink.cpp
index a5642a3b2281936a58b970abe8eb06240dda9171..a005ab44408ff388ebe41076eb77fd0ee2de9444 100644
--- a/sflphone-common/src/sip/sipvoiplink.cpp
+++ b/sflphone-common/src/sip/sipvoiplink.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2004-2009 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
*
* Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
* Author: Yun Liu <yun.liu@savoirfairelinux.com>
@@ -19,6 +19,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include "sipvoiplink.h"
diff --git a/sflphone-common/src/sip/sipvoiplink.h b/sflphone-common/src/sip/sipvoiplink.h
index 16b290fd70b045a5b39036bd6efbfe26c0556de8..20da9443255c77f55bd5016321acb2aa29cc1f16 100644
--- a/sflphone-common/src/sip/sipvoiplink.h
+++ b/sflphone-common/src/sip/sipvoiplink.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2004-2009 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
*
* Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
* Author: Yun Liu <yun.liu@savoirfairelinux.com>
@@ -19,6 +19,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef SIPVOIPLINK_H
diff --git a/sflphone-common/src/sip/testSdesNegotiator.cpp b/sflphone-common/src/sip/testSdesNegotiator.cpp
deleted file mode 100644
index 46f360f293c7d0eb4f118e28164c21af76d7080b..0000000000000000000000000000000000000000
--- a/sflphone-common/src/sip/testSdesNegotiator.cpp
+++ /dev/null
@@ -1,18 +0,0 @@
-#include "SdesNegotiator.h"
-#include <vector>
-#include <iostream>
-
-int main (void)
-{
- std::vector<sfl::CryptoSuiteDefinition> localCapabilities;
- std::vector<std::string> remoteOffer;
-
- remoteOffer.push_back ("a=crypto:1 AES_CM_128_HMAC_SHA1_80 inline:d0RmdmcmVCspeEc3QGZiNWpVLFJhQX1cfHAwJSoj|2^20|1:32");
- remoteOffer.push_back ("a=crypto:1 AES_CM_128_HMAC_SHA1_32 inline:NzB4d1BINUAvLEw6UzF3WSJ+PSdFcGdUJShpX1Zj|2^20|1:32");
-
- sfl::SdesNegotiator sdesNegotiator (localCapabilities, remoteOffer);
-
- sdesNegotiator.negotiate();
-
- return 0;
-}
diff --git a/sflphone-common/src/user_cfg.h b/sflphone-common/src/user_cfg.h
index c48b52ae6978c2da785f96a477f4bf2757074dde..910e3f9e15691e625918a4eab7920034ca078ca7 100644
--- a/sflphone-common/src/user_cfg.h
+++ b/sflphone-common/src/user_cfg.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2004-2008 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Yan Morin <yan.morin@savoirfairelinux.com>
* Author: Laurielle Lea <laurielle.lea@savoirfairelinux.com>
* Authoe: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
@@ -17,6 +17,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __USER_CFG_H__
diff --git a/sflphone-common/src/voiplink.cpp b/sflphone-common/src/voiplink.cpp
index 2ebc8d6723a6c9e5062dc7cfbe18310e5429c635..8d2dc014bc9ea56143205dbba9074139ac3a2063 100644
--- a/sflphone-common/src/voiplink.cpp
+++ b/sflphone-common/src/voiplink.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2005-2009 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
*
* Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
* Author: Alexandre Bourget <alexandre.bourget@savoirfairelinux.com>
@@ -18,6 +18,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include "user_cfg.h"
diff --git a/sflphone-common/src/voiplink.h b/sflphone-common/src/voiplink.h
index 16de9afdae71cee6a9a0f146434206f9f0e943f1..e0d9bd6bdfc0de4f7ce4e780869479ba7736e8ff 100644
--- a/sflphone-common/src/voiplink.h
+++ b/sflphone-common/src/voiplink.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2005-2009 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
*
* Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
* Author: Alexandre Bourget <alexandre.bourget@savoirfairelinux.com>
@@ -18,6 +18,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef __VOIP_LINK_H__
diff --git a/sflphone-common/test/accounttest.cpp b/sflphone-common/test/accounttest.cpp
index 412a1b8b96f17dbd126ce7b3a25a33cac2e53f65..dc905e9a8c040aac9bee05f3edca3a723159fa72 100644
--- a/sflphone-common/test/accounttest.cpp
+++ b/sflphone-common/test/accounttest.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2004-2007 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Julien Bonjean <julien.bonjean@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,6 +15,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <cppunit/extensions/HelperMacros.h>
diff --git a/sflphone-common/test/accounttest.h b/sflphone-common/test/accounttest.h
index 61541c306881ee79bee6ed40a6307fb59017c213..b6c299ab410fdbc88567e6807116279175448df9 100644
--- a/sflphone-common/test/accounttest.h
+++ b/sflphone-common/test/accounttest.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2004-2007 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Julien Bonjean <julien.bonjean@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,6 +15,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef ACCOUNTTEST_H_
diff --git a/sflphone-common/test/audiolayertest.cpp b/sflphone-common/test/audiolayertest.cpp
index 779adde87adf39dbd79a9ab90aaf67e734f031ec..45a226ff5d25bed27a96693e7fae34a4b4b548bc 100644
--- a/sflphone-common/test/audiolayertest.cpp
+++ b/sflphone-common/test/audiolayertest.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2009 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,6 +15,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <stdio.h>
diff --git a/sflphone-common/test/audiolayertest.h b/sflphone-common/test/audiolayertest.h
index b67edfe19c40e038042bc60e82ba3b6a1752017b..8dffaf703f72d2f64c5ae8f99ec92dabe8291f95 100644
--- a/sflphone-common/test/audiolayertest.h
+++ b/sflphone-common/test/audiolayertest.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2009 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,6 +15,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
/*
diff --git a/sflphone-common/test/configurationtest.cpp b/sflphone-common/test/configurationtest.cpp
index 3ccee26112b4983f28d566d48930988082bf4a48..23294f67ccb7b2316212cf823f709768b5db0f8a 100644
--- a/sflphone-common/test/configurationtest.cpp
+++ b/sflphone-common/test/configurationtest.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,6 +15,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <stdio.h>
diff --git a/sflphone-common/test/configurationtest.h b/sflphone-common/test/configurationtest.h
index 7fe7c30ae0fcdcbea913cfbc39bf475e9888371d..1e2f572aa55ecd36324eb1672f0954a6f7badb94 100644
--- a/sflphone-common/test/configurationtest.h
+++ b/sflphone-common/test/configurationtest.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,6 +15,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
/*
diff --git a/sflphone-common/test/constants.h b/sflphone-common/test/constants.h
index 28b27a69d6f3cf1464c565180c34ed1a93597ed3..5b3d0884f4c042d3b91b90325bab1f6d5aefb6aa 100644
--- a/sflphone-common/test/constants.h
+++ b/sflphone-common/test/constants.h
@@ -1,8 +1,31 @@
/*
- * constants.h
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
+ * Author: Alexandre Savard <alexandre.savard@savoirfairelinux.com>
*
- * Created on: 2010-03-15
- * Author: jb
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef CONSTANTS_H_
diff --git a/sflphone-common/test/historytest.cpp b/sflphone-common/test/historytest.cpp
index e8634b60e48fa27000694cdf39735a0a0a8e54c8..8f0853c6a142b7ece063c455b97fb0369473b74e 100644
--- a/sflphone-common/test/historytest.cpp
+++ b/sflphone-common/test/historytest.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2009 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,6 +15,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <stdio.h>
diff --git a/sflphone-common/test/historytest.h b/sflphone-common/test/historytest.h
index 334b9af7ffa2dbe9d588f6a0152212c51b5f9dfa..84b1e7a5ec5a7720f7d3956180e36b034ef0ca8f 100644
--- a/sflphone-common/test/historytest.h
+++ b/sflphone-common/test/historytest.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2009 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,6 +15,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
// Cppunit import
diff --git a/sflphone-common/test/hookmanagertest.cpp b/sflphone-common/test/hookmanagertest.cpp
index 57fc138a0a2cf230178eba3219a317940c9887cd..b0d68c936251e69f7200ce772f29af5f40e3d0a2 100644
--- a/sflphone-common/test/hookmanagertest.cpp
+++ b/sflphone-common/test/hookmanagertest.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2009 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,6 +15,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <stdio.h>
diff --git a/sflphone-common/test/hookmanagertest.h b/sflphone-common/test/hookmanagertest.h
index d9e130c0a5c781bd5f54bd40d7070a009f3df135..f42a95a7049c3664113abbe2ee5f12eba313dc8f 100644
--- a/sflphone-common/test/hookmanagertest.h
+++ b/sflphone-common/test/hookmanagertest.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2009 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,6 +15,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
/*
diff --git a/sflphone-common/test/main.cpp b/sflphone-common/test/main.cpp
index d0b7a6e09bfbd2b4ee483d44af932cc121fd0e95..98f792ad1eb8def07bf678ca9403de4de0e66bbe 100644
--- a/sflphone-common/test/main.cpp
+++ b/sflphone-common/test/main.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2004-2007 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Julien Bonjean <julien.bonjean@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,6 +15,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include "logger.h"
diff --git a/sflphone-common/test/mainbuffertest.cpp b/sflphone-common/test/mainbuffertest.cpp
index 2919828b475e28764fd7b9aafd202f10c16415c3..8b36a4b776dddfaddbb669ba15ce20815cacc973 100644
--- a/sflphone-common/test/mainbuffertest.cpp
+++ b/sflphone-common/test/mainbuffertest.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2009 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Alexandre Savard <alexandre.savard@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,6 +15,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <stdio.h>
diff --git a/sflphone-common/test/mainbuffertest.h b/sflphone-common/test/mainbuffertest.h
index 4aefd398a884094a8946e6f0226bcd04392166a6..1c109c9e22e3371a5816a314abd5430e073708f4 100644
--- a/sflphone-common/test/mainbuffertest.h
+++ b/sflphone-common/test/mainbuffertest.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2009 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Alexandre Savard <alexandre.savard@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,6 +15,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
// Cppunit import
diff --git a/sflphone-common/test/numbercleanertest.cpp b/sflphone-common/test/numbercleanertest.cpp
index 9529727f0f68d6ddb57e1083afbcb34a9e36154d..c13573e3f9bd9d78d07add7d28ad98f176433ebc 100644
--- a/sflphone-common/test/numbercleanertest.cpp
+++ b/sflphone-common/test/numbercleanertest.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2009 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,6 +15,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <stdio.h>
diff --git a/sflphone-common/test/numbercleanertest.h b/sflphone-common/test/numbercleanertest.h
index f303c72526287cd79ee786e1bfd1667b585e9fc8..d4e8774488b19fddd276fe83b5d322fbbaee0918 100644
--- a/sflphone-common/test/numbercleanertest.h
+++ b/sflphone-common/test/numbercleanertest.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2009 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,6 +15,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
// Cppunit import
diff --git a/sflphone-common/test/pluginmanagertest.cpp b/sflphone-common/test/pluginmanagertest.cpp
index 93b18ba2ef7a271a39cda55e30fc9e22f2ce9200..faa28f2b035931a9da340b16b3406397892efa48 100644
--- a/sflphone-common/test/pluginmanagertest.cpp
+++ b/sflphone-common/test/pluginmanagertest.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2009 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,6 +15,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <stdio.h>
diff --git a/sflphone-common/test/pluginmanagertest.h b/sflphone-common/test/pluginmanagertest.h
index c52e9f66d58c136d4284b5b9b43fbfb0b622cac9..a51682966ee9954c393cafaafc7b615e7bdb313e 100644
--- a/sflphone-common/test/pluginmanagertest.h
+++ b/sflphone-common/test/pluginmanagertest.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2009 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,6 +15,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
// Cppunit import
diff --git a/sflphone-common/test/rtptest.cpp b/sflphone-common/test/rtptest.cpp
index 924e9cf8df9f9afb7e8d06943f8260a8b5d6cdf9..366fc1fe23619b18f695228d74db761dfeea64e3 100644
--- a/sflphone-common/test/rtptest.cpp
+++ b/sflphone-common/test/rtptest.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2009 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Alexandre Savarda <alexandre.savard@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,6 +15,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <stdio.h>
diff --git a/sflphone-common/test/rtptest.h b/sflphone-common/test/rtptest.h
index f6e89bce6da688cb403dbc870aeaaccd47e0bed6..57d2b49aaca46020588709b85ba4042a60bc56a9 100644
--- a/sflphone-common/test/rtptest.h
+++ b/sflphone-common/test/rtptest.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2009 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,6 +15,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef _RTP_TEST_
diff --git a/sflphone-common/test/sdesnegotiatortest.cpp b/sflphone-common/test/sdesnegotiatortest.cpp
index 26d545ffd061bda93c9daadb7b47dfc89dcfde6b..6a873613f29b59d4fdebf32b15e4c30c9c4724fe 100644
--- a/sflphone-common/test/sdesnegotiatortest.cpp
+++ b/sflphone-common/test/sdesnegotiatortest.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2009 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Alexandre Savard <alexandre.savard@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,6 +15,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include <stdio.h>
diff --git a/sflphone-common/test/sdesnegotiatortest.h b/sflphone-common/test/sdesnegotiatortest.h
index 97172594a2b8a3b96b4ac52fd2b31a8d2403be97..ee5cb339645004f6fffc53caf9f596c7c7f53552 100644
--- a/sflphone-common/test/sdesnegotiatortest.h
+++ b/sflphone-common/test/sdesnegotiatortest.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2009 Savoir-Faire Linux inc.
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
* Author: Alexandre Savard <alexandre.savard@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,6 +15,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
// Cppunit import
diff --git a/sflphone-common/test/validator.cpp b/sflphone-common/test/validator.cpp
index 56bb01dc9e743fb3bafed1a6d19bf42c74272d64..a12bad1714cebcbda861aa6261f13af8e1851e2f 100644
--- a/sflphone-common/test/validator.cpp
+++ b/sflphone-common/test/validator.cpp
@@ -1,8 +1,31 @@
/*
- * validator.cpp
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
+ * Author: Julien Bonjean <julien.bonjean@savoirfairelinux.com>
*
- * Created on: 2010-03-12
- * Author: jb
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#include "validator.h"
diff --git a/sflphone-common/test/validator.h b/sflphone-common/test/validator.h
index 9f2012e2a6277e1df4eb71ca0d8063c315a25503..2f31ca32934680b2588c139308c8e404fab48afd 100644
--- a/sflphone-common/test/validator.h
+++ b/sflphone-common/test/validator.h
@@ -1,8 +1,31 @@
/*
- * validator.h
+ * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
+ * Author: Alexandre Savard <alexandre.savard@savoirfairelinux.com>
*
- * Created on: 2010-03-12
- * Author: jb
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
*/
#ifndef VALIDATOR_H_