From a205ac43732501561e79bcd9256cbc4f5bc391c7 Mon Sep 17 00:00:00 2001 From: Tristan Matthews <tristan.matthews@savoirfairelinux.com> Date: Wed, 12 Sep 2012 10:59:45 -0400 Subject: [PATCH] * #15503: update copyright for daemon/src/video --- daemon/src/video/check.h | 2 +- daemon/src/video/libav_utils.cpp | 2 +- daemon/src/video/libav_utils.h | 2 +- daemon/src/video/packet_handle.cpp | 2 +- daemon/src/video/packet_handle.h | 2 +- daemon/src/video/test/shmclient.cpp | 30 +++++++++++++++++++ daemon/src/video/test/test_shm.cpp | 30 +++++++++++++++++++ daemon/src/video/test/test_thread.cpp | 30 +++++++++++++++++++ daemon/src/video/test/test_v4l2.cpp | 2 +- daemon/src/video/test/test_video_endpoint.cpp | 2 +- daemon/src/video/test/test_video_endpoint.h | 2 +- daemon/src/video/test/test_video_preview.cpp | 2 +- daemon/src/video/test/test_video_preview.h | 2 +- daemon/src/video/test/test_video_rtp.cpp | 2 +- daemon/src/video/video_preferences.cpp | 2 +- daemon/src/video/video_preferences.h | 2 +- daemon/src/video/video_preview.cpp | 2 +- daemon/src/video/video_preview.h | 2 +- daemon/src/video/video_receive_thread.cpp | 2 +- daemon/src/video/video_receive_thread.h | 2 +- daemon/src/video/video_rtp_session.cpp | 2 +- daemon/src/video/video_rtp_session.h | 2 +- daemon/src/video/video_send_thread.cpp | 2 +- daemon/src/video/video_send_thread.h | 2 +- daemon/src/video/video_v4l2.cpp | 2 +- daemon/src/video/video_v4l2.h | 2 +- daemon/src/video/video_v4l2_list.cpp | 2 +- daemon/src/video/video_v4l2_list.h | 2 +- 28 files changed, 115 insertions(+), 25 deletions(-) diff --git a/daemon/src/video/check.h b/daemon/src/video/check.h index 7f3b2d752d..950a8ca370 100644 --- a/daemon/src/video/check.h +++ b/daemon/src/video/check.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004, 2005, 2006, 2008, 2009, 2010, 2011 Savoir-Faire Linux Inc. + * Copyright (C) 2004-2012 Savoir-Faire Linux Inc. * Author: Tristan Matthews <tristan.matthews@savoirfairelinux.com> * * This program is free software; you can redistribute it and/or modify diff --git a/daemon/src/video/libav_utils.cpp b/daemon/src/video/libav_utils.cpp index 2258ae87e4..7e2c0f00b1 100644 --- a/daemon/src/video/libav_utils.cpp +++ b/daemon/src/video/libav_utils.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010, 2011 Savoir-Faire Linux Inc. + * Copyright (C) 2004-2012 Savoir-Faire Linux Inc. * Author: Tristan Matthews <tristan.matthews@savoirfairelinux.com> * * This program is free software; you can redistribute it and/or modify diff --git a/daemon/src/video/libav_utils.h b/daemon/src/video/libav_utils.h index b695a66030..6a07049e0e 100644 --- a/daemon/src/video/libav_utils.h +++ b/daemon/src/video/libav_utils.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010, 2011 Savoir-Faire Linux Inc. + * Copyright (C) 2004-2012 Savoir-Faire Linux Inc. * Author: Tristan Matthews <tristan.matthews@savoirfairelinux.com> * * This program is free software; you can redistribute it and/or modify diff --git a/daemon/src/video/packet_handle.cpp b/daemon/src/video/packet_handle.cpp index 00124e8b9a..4684f19807 100644 --- a/daemon/src/video/packet_handle.cpp +++ b/daemon/src/video/packet_handle.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2011 Savoir-Faire Linux Inc. + * Copyright (C) 2011-2012 Savoir-Faire Linux Inc. * Author: Tristan Matthews <tristan.matthews@savoirfairelinux.com> * * This program is free software; you can redistribute it and/or modify diff --git a/daemon/src/video/packet_handle.h b/daemon/src/video/packet_handle.h index 94f989101b..f7d251851f 100644 --- a/daemon/src/video/packet_handle.h +++ b/daemon/src/video/packet_handle.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2011 Savoir-Faire Linux Inc. + * Copyright (C) 2011-2012 Savoir-Faire Linux Inc. * Author: Tristan Matthews <tristan.matthews@savoirfairelinux.com> * * This program is free software; you can redistribute it and/or modify diff --git a/daemon/src/video/test/shmclient.cpp b/daemon/src/video/test/shmclient.cpp index ba459d1bfe..89d8e4a98e 100644 --- a/daemon/src/video/test/shmclient.cpp +++ b/daemon/src/video/test/shmclient.cpp @@ -1,3 +1,33 @@ +/* + * Copyright (C) 2011-2012 Savoir-Faire Linux Inc. + * Author: Tristan Matthews <tristan.matthews@savoirfairelinux.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 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 <cstdio> #include <cstdlib> #include "shm_src.h" diff --git a/daemon/src/video/test/test_shm.cpp b/daemon/src/video/test/test_shm.cpp index d51bf5a2b0..06ddb9afff 100644 --- a/daemon/src/video/test/test_shm.cpp +++ b/daemon/src/video/test/test_shm.cpp @@ -1,3 +1,33 @@ +/* + * Copyright (C) 2012 Savoir-Faire Linux Inc. + * Author: Tristan Matthews <tristan.matthews@savoirfairelinux.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 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 "shm_sink.h" #include "shm_src.h" #include <thread> diff --git a/daemon/src/video/test/test_thread.cpp b/daemon/src/video/test/test_thread.cpp index f0f9c28875..941bcc9bce 100644 --- a/daemon/src/video/test/test_thread.cpp +++ b/daemon/src/video/test/test_thread.cpp @@ -1,3 +1,33 @@ +/* + * Copyright (C) 2012 Savoir-Faire Linux Inc. + * Author: Tristan Matthews <tristan.matthews@savoirfairelinux.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 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 "cc_thread.h" #include <memory> #include <iostream> diff --git a/daemon/src/video/test/test_v4l2.cpp b/daemon/src/video/test/test_v4l2.cpp index 0db46cfbf2..2b3e880753 100644 --- a/daemon/src/video/test/test_v4l2.cpp +++ b/daemon/src/video/test/test_v4l2.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2011 Savoir-Faire Linux Inc. + * Copyright (C) 2011-2012 Savoir-Faire Linux Inc. * Author: Rafaël Carré <rafael.carre@savoirfairelinux.com> * * This program is free software; you can redistribute it and/or modify diff --git a/daemon/src/video/test/test_video_endpoint.cpp b/daemon/src/video/test/test_video_endpoint.cpp index 7eec1a1c17..9722a04a70 100644 --- a/daemon/src/video/test/test_video_endpoint.cpp +++ b/daemon/src/video/test/test_video_endpoint.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2011 Savoir-Faire Linux Inc. + * Copyright (C) 2011-2012 Savoir-Faire Linux Inc. * Author: Tristan Matthews <tristan.matthews@savoirfairelinux.com> * * This program is free software; you can redistribute it and/or modify diff --git a/daemon/src/video/test/test_video_endpoint.h b/daemon/src/video/test/test_video_endpoint.h index 90ecdb13ab..c734f8da9c 100644 --- a/daemon/src/video/test/test_video_endpoint.h +++ b/daemon/src/video/test/test_video_endpoint.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2011 Savoir-Faire Linux Inc. + * Copyright (C) 2011-2012 Savoir-Faire Linux Inc. * Author: Tristan Matthews <tristan.matthews@savoirfairelinux.com> * * This program is free software; you can redistribute it and/or modify diff --git a/daemon/src/video/test/test_video_preview.cpp b/daemon/src/video/test/test_video_preview.cpp index f295fd2ba3..d2eba23b09 100644 --- a/daemon/src/video/test/test_video_preview.cpp +++ b/daemon/src/video/test/test_video_preview.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2011 Savoir-Faire Linux Inc. + * Copyright (C) 2011-2012 Savoir-Faire Linux Inc. * Author: Tristan Matthews <tristan.matthews@savoirfairelinux.com> * * This program is free software; you can redistribute it and/or modify diff --git a/daemon/src/video/test/test_video_preview.h b/daemon/src/video/test/test_video_preview.h index 7fdff2dade..5e43cc166c 100644 --- a/daemon/src/video/test/test_video_preview.h +++ b/daemon/src/video/test/test_video_preview.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2011 Savoir-Faire Linux Inc. + * Copyright (C) 2011-2012 Savoir-Faire Linux Inc. * Author: Tristan Matthews <tristan.matthews@savoirfairelinux.com> * * This program is free software; you can redistribute it and/or modify diff --git a/daemon/src/video/test/test_video_rtp.cpp b/daemon/src/video/test/test_video_rtp.cpp index 0cfaec39ec..02ca9bbc0c 100644 --- a/daemon/src/video/test/test_video_rtp.cpp +++ b/daemon/src/video/test/test_video_rtp.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2011 Savoir-Faire Linux Inc. + * Copyright (C) 2011-2012 Savoir-Faire Linux Inc. * Author: Tristan Matthews <tristan.matthews@savoirfairelinux.com> * * This program is free software; you can redistribute it and/or modify diff --git a/daemon/src/video/video_preferences.cpp b/daemon/src/video/video_preferences.cpp index 741060b3e5..afc00cd6f8 100644 --- a/daemon/src/video/video_preferences.cpp +++ b/daemon/src/video/video_preferences.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004, 2005, 2006, 2008, 2009, 2010, 2011 Savoir-Faire Linux Inc. + * Copyright (C) 2004-2012 Savoir-Faire Linux Inc. * Author: Alexandre Savard <alexandre.savard@savoirfairelinux.com> * * This program is free software; you can redistribute it and/or modify diff --git a/daemon/src/video/video_preferences.h b/daemon/src/video/video_preferences.h index f2b37ffef0..618c0888c7 100644 --- a/daemon/src/video/video_preferences.h +++ b/daemon/src/video/video_preferences.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004, 2005, 2006, 2008, 2009, 2010, 2011 Savoir-Faire Linux Inc. + * Copyright (C) 2004-2012 Savoir-Faire Linux Inc. * Author: Alexandre Savard <alexandre.savard@savoirfairelinux.com> * * This program is free software; you can redistribute it and/or modify diff --git a/daemon/src/video/video_preview.cpp b/daemon/src/video/video_preview.cpp index bf2aa9d2cc..396cb94200 100644 --- a/daemon/src/video/video_preview.cpp +++ b/daemon/src/video/video_preview.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010, 2011 Savoir-Faire Linux Inc. + * Copyright (C) 2004-2012 Savoir-Faire Linux Inc. * Author: Tristan Matthews <tristan.matthews@savoirfairelinux.com> * * This program is free software; you can redistribute it and/or modify diff --git a/daemon/src/video/video_preview.h b/daemon/src/video/video_preview.h index 212d9bc3f6..f536de6c92 100644 --- a/daemon/src/video/video_preview.h +++ b/daemon/src/video/video_preview.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2011 Savoir-Faire Linux Inc. + * Copyright (C) 2011-2012 Savoir-Faire Linux Inc. * Author: Tristan Matthews <tristan.matthews@savoirfairelinux.com> * * This program is free software; you can redistribute it and/or modify diff --git a/daemon/src/video/video_receive_thread.cpp b/daemon/src/video/video_receive_thread.cpp index 6abd23b360..7a36bae6b2 100644 --- a/daemon/src/video/video_receive_thread.cpp +++ b/daemon/src/video/video_receive_thread.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004, 2005, 2006, 2008, 2009, 2010, 2011 Savoir-Faire Linux Inc. + * Copyright (C) 2004-2012 Savoir-Faire Linux Inc. * * Author: Tristan Matthews <tristan.matthews@savoirfairelinux.com> * diff --git a/daemon/src/video/video_receive_thread.h b/daemon/src/video/video_receive_thread.h index a908972b8d..2c915d15c4 100644 --- a/daemon/src/video/video_receive_thread.h +++ b/daemon/src/video/video_receive_thread.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2011 Savoir-Faire Linux Inc. + * Copyright (C) 2011-2012 Savoir-Faire Linux Inc. * Author: Tristan Matthews <tristan.matthews@savoirfairelinux.com> * * This program is free software; you can redistribute it and/or modify diff --git a/daemon/src/video/video_rtp_session.cpp b/daemon/src/video/video_rtp_session.cpp index ceb0c25b7a..e75aa3087d 100644 --- a/daemon/src/video/video_rtp_session.cpp +++ b/daemon/src/video/video_rtp_session.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010, 2011 Savoir-Faire Linux Inc. + * Copyright (C) 2004-2012 Savoir-Faire Linux Inc. * Author: Tristan Matthews <tristan.matthews@savoirfairelinux.com> * * This program is free software; you can redistribute it and/or modify diff --git a/daemon/src/video/video_rtp_session.h b/daemon/src/video/video_rtp_session.h index 748ff566ec..a3cb58f86a 100644 --- a/daemon/src/video/video_rtp_session.h +++ b/daemon/src/video/video_rtp_session.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010, 2011 Savoir-Faire Linux Inc. + * Copyright (C) 2004-2012 Savoir-Faire Linux Inc. * Author: Tristan Matthews <tristan.matthews@savoirfairelinux.com> * * This program is free software; you can redistribute it and/or modify diff --git a/daemon/src/video/video_send_thread.cpp b/daemon/src/video/video_send_thread.cpp index 7be1fdc972..6c82baa397 100644 --- a/daemon/src/video/video_send_thread.cpp +++ b/daemon/src/video/video_send_thread.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010, 2011 Savoir-Faire Linux Inc. + * Copyright (C) 2004-2012 Savoir-Faire Linux Inc. * Author: Tristan Matthews <tristan.matthews@savoirfairelinux.com> * * This program is free software; you can redistribute it and/or modify diff --git a/daemon/src/video/video_send_thread.h b/daemon/src/video/video_send_thread.h index 3aa0d3b6a1..24a2f2bf2d 100644 --- a/daemon/src/video/video_send_thread.h +++ b/daemon/src/video/video_send_thread.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2011 Savoir-Faire Linux Inc. + * Copyright (C) 2011-2012 Savoir-Faire Linux Inc. * Author: Tristan Matthews <tristan.matthews@savoirfairelinux.com> * * This program is free software; you can redistribute it and/or modify diff --git a/daemon/src/video/video_v4l2.cpp b/daemon/src/video/video_v4l2.cpp index 4777182764..38783619ee 100644 --- a/daemon/src/video/video_v4l2.cpp +++ b/daemon/src/video/video_v4l2.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2011 Savoir-Faire Linux Inc. + * Copyright (C) 2011-2012 Savoir-Faire Linux Inc. * Author: Rafaël Carré <rafael.carre@savoirfairelinux.com> * * This program is free software; you can redistribute it and/or modify diff --git a/daemon/src/video/video_v4l2.h b/daemon/src/video/video_v4l2.h index 7d51f3a7db..872c325653 100644 --- a/daemon/src/video/video_v4l2.h +++ b/daemon/src/video/video_v4l2.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2011 Savoir-Faire Linux Inc. + * Copyright (C) 2011-2012 Savoir-Faire Linux Inc. * Author: Rafaël Carré <rafael.carre@savoirfairelinux.com> * * This program is free software; you can redistribute it and/or modify diff --git a/daemon/src/video/video_v4l2_list.cpp b/daemon/src/video/video_v4l2_list.cpp index d9b10f66db..b277001863 100644 --- a/daemon/src/video/video_v4l2_list.cpp +++ b/daemon/src/video/video_v4l2_list.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2011 Savoir-Faire Linux Inc. + * Copyright (C) 2011-2012 Savoir-Faire Linux Inc. * Copyright © 2009 Rémi Denis-Courmont * * Author: Rafaël Carré <rafael.carre@savoirfairelinux.com> diff --git a/daemon/src/video/video_v4l2_list.h b/daemon/src/video/video_v4l2_list.h index d139227b1e..3330fc5cad 100644 --- a/daemon/src/video/video_v4l2_list.h +++ b/daemon/src/video/video_v4l2_list.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2011 Savoir-Faire Linux Inc. + * Copyright (C) 2011-2012 Savoir-Faire Linux Inc. * Author: Rafaël Carré <rafael.carre@savoirfairelinux.com> * * This program is free software; you can redistribute it and/or modify -- GitLab