Skip to content

Commit fdde8b3

Browse files
Add references to src/ copies for LICENSE etc.
Review URL: http://webrtc-codereview.appspot.com/246007 git-svn-id: http://webrtc.googlecode.com/svn/trunk@818 4adac7df-926f-26a2-2b94-8c16560cd09d
1 parent cb18121 commit fdde8b3

File tree

4 files changed

+5
-78
lines changed

4 files changed

+5
-78
lines changed

LICENSE

+1-29
Original file line numberDiff line numberDiff line change
@@ -1,29 +1 @@
1-
Copyright (c) 2011, Google Inc. All rights reserved.
2-
3-
Redistribution and use in source and binary forms, with or without
4-
modification, are permitted provided that the following conditions are
5-
met:
6-
7-
* Redistributions of source code must retain the above copyright
8-
notice, this list of conditions and the following disclaimer.
9-
10-
* Redistributions in binary form must reproduce the above copyright
11-
notice, this list of conditions and the following disclaimer in
12-
the documentation and/or other materials provided with the
13-
distribution.
14-
15-
* Neither the name of Google nor the names of its contributors may
16-
be used to endorse or promote products derived from this software
17-
without specific prior written permission.
18-
19-
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
20-
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
21-
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
22-
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
23-
HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
24-
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
25-
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
26-
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
27-
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
28-
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
29-
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
1+
Refer to src/LICENSE.

LICENSE_THIRD_PARTY

+1-24
Original file line numberDiff line numberDiff line change
@@ -1,24 +1 @@
1-
This source tree contains third party source code which is governed by third
2-
party licenses. This file contains references to files which are under other
3-
licenses than the one provided in the LICENSE file in the root of the source
4-
tree.
5-
6-
Files governed by third party licenses:
7-
modules/audio_coding/codecs/G711/main/source/g711.h
8-
modules/audio_coding/codecs/G711/main/source/g711.c
9-
modules/audio_coding/codecs/G722/main/source/g722_decode.h
10-
modules/audio_coding/codecs/G722/main/source/g722_decode.c
11-
modules/audio_coding/codecs/G722/main/source/g722_encode.h
12-
modules/audio_coding/codecs/G722/main/source/g722_encode.c
13-
modules/audio_coding/codecs/iSAC/main/source/fft.c
14-
modules/audio_device/main/source/Mac/portaudio/pa_memorybarrier.h
15-
modules/audio_device/main/source/Mac/portaudio/pa_ringbuffer.h
16-
modules/audio_device/main/source/Mac/portaudio/pa_ringbuffer.c
17-
modules/audio_processing/utility/fft4g.c
18-
modules/audio_processing/aec/main/source/aec_core_rdft.c
19-
system_wrappers/interface/fix_interlocked_exchange_pointer_windows.h
20-
system_wrappers/interface/scoped_refptr.h
21-
system_wrappers/source/condition_variable_windows.cc
22-
system_wrappers/source/spreadsortlib/constants.hpp
23-
system_wrappers/source/spreadsortlib/spreadsort.hpp
24-
system_wrappers/source/thread_windows_set_name.h
1+
Refer to src/LICENSE_THIRD_PARTY.

PATENTS

+1-24
Original file line numberDiff line numberDiff line change
@@ -1,24 +1 @@
1-
Additional IP Rights Grant (Patents)
2-
3-
"This implementation" means the copyrightable works distributed by
4-
Google as part of the WebRTC code package.
5-
6-
Google hereby grants to you a perpetual, worldwide, non-exclusive,
7-
no-charge, irrevocable (except as stated in this section) patent
8-
license to make, have made, use, offer to sell, sell, import,
9-
transfer, and otherwise run, modify and propagate the contents of this
10-
implementation of the WebRTC code package, where such license applies
11-
only to those patent claims, both currently owned by Google and
12-
acquired in the future, licensable by Google that are necessarily
13-
infringed by this implementation of the WebRTC code package. This
14-
grant does not include claims that would be infringed only as a
15-
consequence of further modification of this implementation. If you or
16-
your agent or exclusive licensee institute or order or agree to the
17-
institution of patent litigation against any entity (including a
18-
cross-claim or counterclaim in a lawsuit) alleging that this
19-
implementation of the WebRTC code package or any code incorporated
20-
within this implementation of the WebRTC code package constitutes
21-
direct or contributory patent infringement, or inducement of patent
22-
infringement, then any patent rights granted to you under this License
23-
for this implementation of the WebRTC code package shall terminate as
24-
of the date such litigation is filed.
1+
Refer to src/PATENTS.

src/LICENSE_THIRD_PARTY

+2-1
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,9 @@ modules/audio_device/main/source/Mac/portaudio/pa_memorybarrier.h
1515
modules/audio_device/main/source/Mac/portaudio/pa_ringbuffer.h
1616
modules/audio_device/main/source/Mac/portaudio/pa_ringbuffer.c
1717
modules/audio_processing/utility/fft4g.c
18-
modules/audio_processing/aec/main/source/aec_core_rdft.c
18+
modules/audio_processing/aec/aec_core_rdft.c
1919
system_wrappers/interface/fix_interlocked_exchange_pointer_windows.h
20+
system_wrappers/interface/scoped_refptr.h
2021
system_wrappers/source/condition_variable_windows.cc
2122
system_wrappers/source/spreadsortlib/constants.hpp
2223
system_wrappers/source/spreadsortlib/spreadsort.hpp

0 commit comments

Comments
 (0)