diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000000..f951e1c5eb --- /dev/null +++ b/LICENSE @@ -0,0 +1,28 @@ +Copyright 2014, Google Inc. All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: + + * Redistributions of source code must retain the above copyright +notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above +copyright notice, this list of conditions and the following disclaimer +in the documentation and/or other materials provided with the +distribution. + * Neither the name of Google Inc. nor the names of its +contributors may be used to endorse or promote products derived from +this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + diff --git a/app/fixed_key_encryption_flags.h b/app/fixed_key_encryption_flags.h index ab6ab3cc4a..0a898812d6 100644 --- a/app/fixed_key_encryption_flags.h +++ b/app/fixed_key_encryption_flags.h @@ -1,6 +1,8 @@ -// Copyright (c) 2013 Google Inc. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. +// Copyright 2014 Google Inc. All rights reserved. +// +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file or at +// https://developers.google.com/open-source/licenses/bsd // // Defines command line flags for fixed key encryption. diff --git a/app/mpd_generator.cc b/app/mpd_generator.cc index a633306139..4a6b16c38e 100644 --- a/app/mpd_generator.cc +++ b/app/mpd_generator.cc @@ -1,3 +1,9 @@ +// Copyright 2014 Google Inc. All rights reserved. +// +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file or at +// https://developers.google.com/open-source/licenses/bsd + #include "app/mpd_generator_flags.h" #include "base/logging.h" #include "base/strings/string_split.h" diff --git a/app/mpd_generator_flags.h b/app/mpd_generator_flags.h index 329462e1be..593cfc552d 100644 --- a/app/mpd_generator_flags.h +++ b/app/mpd_generator_flags.h @@ -1,4 +1,8 @@ -// Copyright (c) 2014 Google Inc. All rights reserved. +// Copyright 2014 Google Inc. All rights reserved. +// +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file or at +// https://developers.google.com/open-source/licenses/bsd #ifndef APP_MPD_GENERATOR_FLAGS_H_ #define APP_MPD_GENERATOR_FLAGS_H_ diff --git a/app/muxer_flags.h b/app/muxer_flags.h index eefb6db551..12a055216a 100644 --- a/app/muxer_flags.h +++ b/app/muxer_flags.h @@ -1,6 +1,8 @@ -// Copyright (c) 2013 Google Inc. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. +// Copyright 2014 Google Inc. All rights reserved. +// +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file or at +// https://developers.google.com/open-source/licenses/bsd // // Defines Muxer flags. diff --git a/app/packager_main.cc b/app/packager_main.cc index 09c3c328b6..37aab4cb7e 100644 --- a/app/packager_main.cc +++ b/app/packager_main.cc @@ -1,6 +1,8 @@ -// Copyright (c) 2013 Google Inc. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. +// Copyright 2014 Google Inc. All rights reserved. +// +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file or at +// https://developers.google.com/open-source/licenses/bsd #include #include diff --git a/app/widevine_encryption_flags.h b/app/widevine_encryption_flags.h index 82bb49a4d2..3fc99ed6d4 100644 --- a/app/widevine_encryption_flags.h +++ b/app/widevine_encryption_flags.h @@ -1,6 +1,8 @@ -// Copyright (c) 2013 Google Inc. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. +// Copyright 2014 Google Inc. All rights reserved. +// +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file or at +// https://developers.google.com/open-source/licenses/bsd // // Defines command line flags for widevine_encryption. diff --git a/media/base/aes_encryptor.cc b/media/base/aes_encryptor.cc index f561bb562e..d6753549b0 100644 --- a/media/base/aes_encryptor.cc +++ b/media/base/aes_encryptor.cc @@ -1,6 +1,8 @@ -// Copyright (c) 2013 Google Inc. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. +// Copyright 2014 Google Inc. All rights reserved. +// +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file or at +// https://developers.google.com/open-source/licenses/bsd #include "media/base/aes_encryptor.h" diff --git a/media/base/aes_encryptor.h b/media/base/aes_encryptor.h index 3c9d9677ad..2635a77324 100644 --- a/media/base/aes_encryptor.h +++ b/media/base/aes_encryptor.h @@ -1,6 +1,8 @@ -// Copyright (c) 2013 Google Inc. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. +// Copyright 2014 Google Inc. All rights reserved. +// +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file or at +// https://developers.google.com/open-source/licenses/bsd // // AES Encryptor implementation using openssl. diff --git a/media/base/aes_encryptor_unittest.cc b/media/base/aes_encryptor_unittest.cc index 261aa8a3ee..e3b4ac43a2 100644 --- a/media/base/aes_encryptor_unittest.cc +++ b/media/base/aes_encryptor_unittest.cc @@ -1,6 +1,8 @@ -// Copyright (c) 2013 Google Inc. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. +// Copyright 2014 Google Inc. All rights reserved. +// +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file or at +// https://developers.google.com/open-source/licenses/bsd #include "media/base/aes_encryptor.h" diff --git a/media/base/audio_stream_info.cc b/media/base/audio_stream_info.cc index a0e0e41119..7d0b6350fc 100644 --- a/media/base/audio_stream_info.cc +++ b/media/base/audio_stream_info.cc @@ -1,6 +1,8 @@ -// Copyright (c) 2013 Google Inc. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. +// Copyright 2014 Google Inc. All rights reserved. +// +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file or at +// https://developers.google.com/open-source/licenses/bsd #include "media/base/audio_stream_info.h" diff --git a/media/base/audio_stream_info.h b/media/base/audio_stream_info.h index e04cd20139..d77bb1d2af 100644 --- a/media/base/audio_stream_info.h +++ b/media/base/audio_stream_info.h @@ -1,6 +1,8 @@ -// Copyright (c) 2013 Google Inc. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. +// Copyright 2014 Google Inc. All rights reserved. +// +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file or at +// https://developers.google.com/open-source/licenses/bsd #ifndef MEDIA_BASE_AUDIO_STREAM_INFO_H_ #define MEDIA_BASE_AUDIO_STREAM_INFO_H_ diff --git a/media/base/buffer_reader.cc b/media/base/buffer_reader.cc index 6cc124dfa7..da70fdb162 100644 --- a/media/base/buffer_reader.cc +++ b/media/base/buffer_reader.cc @@ -1,6 +1,8 @@ -// Copyright (c) 2013 Google Inc. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. +// Copyright 2014 Google Inc. All rights reserved. +// +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file or at +// https://developers.google.com/open-source/licenses/bsd #include "media/base/buffer_reader.h" diff --git a/media/base/buffer_reader.h b/media/base/buffer_reader.h index 7af28e7f11..6c71345a70 100644 --- a/media/base/buffer_reader.h +++ b/media/base/buffer_reader.h @@ -1,6 +1,8 @@ -// Copyright (c) 2013 Google Inc. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. +// Copyright 2014 Google Inc. All rights reserved. +// +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file or at +// https://developers.google.com/open-source/licenses/bsd #ifndef MEDIA_BASE_BUFFER_READER_H_ #define MEDIA_BASE_BUFFER_READER_H_ diff --git a/media/base/buffer_writer.cc b/media/base/buffer_writer.cc index 38a854f621..e3b81edd2f 100644 --- a/media/base/buffer_writer.cc +++ b/media/base/buffer_writer.cc @@ -1,6 +1,8 @@ -// Copyright (c) 2013 Google Inc. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. +// Copyright 2014 Google Inc. All rights reserved. +// +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file or at +// https://developers.google.com/open-source/licenses/bsd #include "media/base/buffer_writer.h" diff --git a/media/base/buffer_writer.h b/media/base/buffer_writer.h index d69aa6d3b6..8f92d16e79 100644 --- a/media/base/buffer_writer.h +++ b/media/base/buffer_writer.h @@ -1,6 +1,8 @@ -// Copyright (c) 2013 Google Inc. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. +// Copyright 2014 Google Inc. All rights reserved. +// +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file or at +// https://developers.google.com/open-source/licenses/bsd // // A simple write buffer implementation, which appends various data types to // buffer. diff --git a/media/base/buffer_writer_unittest.cc b/media/base/buffer_writer_unittest.cc index cf2b54e14e..692142ca2c 100644 --- a/media/base/buffer_writer_unittest.cc +++ b/media/base/buffer_writer_unittest.cc @@ -1,6 +1,8 @@ -// Copyright (c) 2013 Google Inc. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. +// Copyright 2014 Google Inc. All rights reserved. +// +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file or at +// https://developers.google.com/open-source/licenses/bsd #include "media/base/buffer_writer.h" diff --git a/media/base/decryptor_source.h b/media/base/decryptor_source.h index a909209156..d045a55cdd 100644 --- a/media/base/decryptor_source.h +++ b/media/base/decryptor_source.h @@ -1,6 +1,8 @@ -// Copyright (c) 2013 Google Inc. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. +// Copyright 2014 Google Inc. All rights reserved. +// +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file or at +// https://developers.google.com/open-source/licenses/bsd // // DecryptorSource is responsible for decryption key acquisition. diff --git a/media/base/demuxer.cc b/media/base/demuxer.cc index e0e14f5a5b..d544dad4c3 100644 --- a/media/base/demuxer.cc +++ b/media/base/demuxer.cc @@ -1,6 +1,8 @@ -// Copyright (c) 2013 Google Inc. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. +// Copyright 2014 Google Inc. All rights reserved. +// +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file or at +// https://developers.google.com/open-source/licenses/bsd #include "media/base/demuxer.h" diff --git a/media/base/demuxer.h b/media/base/demuxer.h index 6e58c4b93b..3e552aed4b 100644 --- a/media/base/demuxer.h +++ b/media/base/demuxer.h @@ -1,6 +1,8 @@ -// Copyright (c) 2013 Google Inc. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. +// Copyright 2014 Google Inc. All rights reserved. +// +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file or at +// https://developers.google.com/open-source/licenses/bsd #ifndef MEDIA_BASE_DEMUXER_H_ #define MEDIA_BASE_DEMUXER_H_ diff --git a/media/base/encryptor_source.cc b/media/base/encryptor_source.cc index 9201fb45f5..3a122bba1d 100644 --- a/media/base/encryptor_source.cc +++ b/media/base/encryptor_source.cc @@ -1,6 +1,8 @@ -// Copyright (c) 2013 Google Inc. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. +// Copyright 2014 Google Inc. All rights reserved. +// +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file or at +// https://developers.google.com/open-source/licenses/bsd #include "media/base/encryptor_source.h" diff --git a/media/base/encryptor_source.h b/media/base/encryptor_source.h index cf9a3835cc..9a2aa4adbb 100644 --- a/media/base/encryptor_source.h +++ b/media/base/encryptor_source.h @@ -1,6 +1,8 @@ -// Copyright (c) 2013 Google Inc. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. +// Copyright 2014 Google Inc. All rights reserved. +// +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file or at +// https://developers.google.com/open-source/licenses/bsd // // EncryptorSource is responsible for encryption key acquisition. diff --git a/media/base/fake_prng.cc b/media/base/fake_prng.cc index bacda4f06d..bb830acfcf 100644 --- a/media/base/fake_prng.cc +++ b/media/base/fake_prng.cc @@ -1,6 +1,8 @@ -// Copyright (c) 2013 Google Inc. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. +// Copyright 2014 Google Inc. All rights reserved. +// +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file or at +// https://developers.google.com/open-source/licenses/bsd #include "media/base/fake_prng.h" diff --git a/media/base/fake_prng.h b/media/base/fake_prng.h index 56fbfe1917..1fb8b770f2 100644 --- a/media/base/fake_prng.h +++ b/media/base/fake_prng.h @@ -1,6 +1,8 @@ -// Copyright (c) 2013 Google Inc. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. +// Copyright 2014 Google Inc. All rights reserved. +// +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file or at +// https://developers.google.com/open-source/licenses/bsd // // Fake, deterministic PRNG for OpenSSL to be used for unit testing. diff --git a/media/base/fixed_encryptor_source.cc b/media/base/fixed_encryptor_source.cc index 6d4fecb259..8382039311 100644 --- a/media/base/fixed_encryptor_source.cc +++ b/media/base/fixed_encryptor_source.cc @@ -1,6 +1,8 @@ -// Copyright (c) 2013 Google Inc. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. +// Copyright 2014 Google Inc. All rights reserved. +// +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file or at +// https://developers.google.com/open-source/licenses/bsd #include "media/base/fixed_encryptor_source.h" diff --git a/media/base/fixed_encryptor_source.h b/media/base/fixed_encryptor_source.h index 50ada38d9a..558121ff92 100644 --- a/media/base/fixed_encryptor_source.h +++ b/media/base/fixed_encryptor_source.h @@ -1,6 +1,8 @@ -// Copyright (c) 2013 Google Inc. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. +// Copyright 2014 Google Inc. All rights reserved. +// +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file or at +// https://developers.google.com/open-source/licenses/bsd // // Defines a fixed encryptor source with keys provided by user. diff --git a/media/base/httpfetcher.cc b/media/base/httpfetcher.cc index 1b1d1b3862..e35ac91718 100644 --- a/media/base/httpfetcher.cc +++ b/media/base/httpfetcher.cc @@ -1,6 +1,8 @@ -// Copyright (c) 2013 Google Inc. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. +// Copyright 2014 Google Inc. All rights reserved. +// +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file or at +// https://developers.google.com/open-source/licenses/bsd #include "media/base/httpfetcher.h" diff --git a/media/base/httpfetcher.h b/media/base/httpfetcher.h index 820c20b92e..7715ef74d3 100644 --- a/media/base/httpfetcher.h +++ b/media/base/httpfetcher.h @@ -1,6 +1,8 @@ -// Copyright (c) 2013 Google Inc. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. +// Copyright 2014 Google Inc. All rights reserved. +// +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file or at +// https://developers.google.com/open-source/licenses/bsd #ifndef MEDIA_BASE_HTTPFETCHER_H_ #define MEDIA_BASE_HTTPFETCHER_H_ diff --git a/media/base/httpfetcher_unittest.cc b/media/base/httpfetcher_unittest.cc index ada82a3e78..30d0e6dbee 100644 --- a/media/base/httpfetcher_unittest.cc +++ b/media/base/httpfetcher_unittest.cc @@ -1,6 +1,8 @@ -// Copyright (c) 2013 Google Inc. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. +// Copyright 2014 Google Inc. All rights reserved. +// +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file or at +// https://developers.google.com/open-source/licenses/bsd #include "media/base/httpfetcher.h" diff --git a/media/base/media_base.gyp b/media/base/media_base.gyp index dca777b879..8f7db84f66 100644 --- a/media/base/media_base.gyp +++ b/media/base/media_base.gyp @@ -1,6 +1,8 @@ -# Copyright (c) 2013 Google Inc. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. +# Copyright 2014 Google Inc. All rights reserved. +# +# Use of this source code is governed by a BSD-style +# license that can be found in the LICENSE file or at +# https://developers.google.com/open-source/licenses/bsd { 'target_defaults': { diff --git a/media/base/media_parser.h b/media/base/media_parser.h index 8995798282..ed5d77fd9e 100644 --- a/media/base/media_parser.h +++ b/media/base/media_parser.h @@ -1,6 +1,8 @@ -// Copyright (c) 2013 Google Inc. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. +// Copyright 2014 Google Inc. All rights reserved. +// +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file or at +// https://developers.google.com/open-source/licenses/bsd #ifndef MEDIA_BASE_MEDIA_PARSER_H_ #define MEDIA_BASE_MEDIA_PARSER_H_ diff --git a/media/base/media_sample.cc b/media/base/media_sample.cc index 2a1e318bba..9448ddae9b 100644 --- a/media/base/media_sample.cc +++ b/media/base/media_sample.cc @@ -1,6 +1,8 @@ -// Copyright (c) 2013 Google Inc. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. +// Copyright 2014 Google Inc. All rights reserved. +// +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file or at +// https://developers.google.com/open-source/licenses/bsd #include "media/base/media_sample.h" diff --git a/media/base/media_sample.h b/media/base/media_sample.h index 69236dc2cc..09ffd8b14c 100644 --- a/media/base/media_sample.h +++ b/media/base/media_sample.h @@ -1,6 +1,8 @@ -// Copyright (c) 2013 Google Inc. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. +// Copyright 2014 Google Inc. All rights reserved. +// +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file or at +// https://developers.google.com/open-source/licenses/bsd #ifndef MEDIA_BASE_MEDIA_SAMPLE_H_ #define MEDIA_BASE_MEDIA_SAMPLE_H_ diff --git a/media/base/media_stream.cc b/media/base/media_stream.cc index a3c908d6f3..6af62dcf53 100644 --- a/media/base/media_stream.cc +++ b/media/base/media_stream.cc @@ -1,6 +1,8 @@ -// Copyright (c) 2013 Google Inc. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. +// Copyright 2014 Google Inc. All rights reserved. +// +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file or at +// https://developers.google.com/open-source/licenses/bsd #include "media/base/media_stream.h" diff --git a/media/base/media_stream.h b/media/base/media_stream.h index feadc6d67c..f750bf775f 100644 --- a/media/base/media_stream.h +++ b/media/base/media_stream.h @@ -1,6 +1,8 @@ -// Copyright (c) 2013 Google Inc. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. +// Copyright 2014 Google Inc. All rights reserved. +// +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file or at +// https://developers.google.com/open-source/licenses/bsd // // MediaStream connects Demuxer to Muxer. diff --git a/media/base/muxer.cc b/media/base/muxer.cc index e634c44915..c57cdffab4 100644 --- a/media/base/muxer.cc +++ b/media/base/muxer.cc @@ -1,6 +1,8 @@ -// Copyright (c) 2013 Google Inc. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. +// Copyright 2014 Google Inc. All rights reserved. +// +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file or at +// https://developers.google.com/open-source/licenses/bsd #include "media/base/muxer.h" diff --git a/media/base/muxer.h b/media/base/muxer.h index 1f1724cc65..b061dbb7bc 100644 --- a/media/base/muxer.h +++ b/media/base/muxer.h @@ -1,6 +1,8 @@ -// Copyright (c) 2013 Google Inc. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. +// Copyright 2014 Google Inc. All rights reserved. +// +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file or at +// https://developers.google.com/open-source/licenses/bsd // // Defines the muxer interface. diff --git a/media/base/muxer_options.cc b/media/base/muxer_options.cc index 44e6b77cf5..e4e030c35f 100644 --- a/media/base/muxer_options.cc +++ b/media/base/muxer_options.cc @@ -1,6 +1,8 @@ -// Copyright (c) 2013 Google Inc. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. +// Copyright 2014 Google Inc. All rights reserved. +// +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file or at +// https://developers.google.com/open-source/licenses/bsd #include "media/base/muxer_options.h" diff --git a/media/base/muxer_options.h b/media/base/muxer_options.h index c2bfb08bc8..5e6b844cd2 100644 --- a/media/base/muxer_options.h +++ b/media/base/muxer_options.h @@ -1,6 +1,8 @@ -// Copyright (c) 2013 Google Inc. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. +// Copyright 2014 Google Inc. All rights reserved. +// +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file or at +// https://developers.google.com/open-source/licenses/bsd #ifndef MEDIA_BASE_MUXER_OPTIONS_H_ #define MEDIA_BASE_MUXER_OPTIONS_H_ diff --git a/media/base/request_signer.cc b/media/base/request_signer.cc index 9c39fc21ea..e512c542c6 100644 --- a/media/base/request_signer.cc +++ b/media/base/request_signer.cc @@ -1,6 +1,8 @@ -// Copyright (c) 2013 Google Inc. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. +// Copyright 2014 Google Inc. All rights reserved. +// +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file or at +// https://developers.google.com/open-source/licenses/bsd #include "media/base/request_signer.h" diff --git a/media/base/request_signer.h b/media/base/request_signer.h index 38257fa48a..4eac33f0c0 100644 --- a/media/base/request_signer.h +++ b/media/base/request_signer.h @@ -1,6 +1,8 @@ -// Copyright (c) 2013 Google Inc. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. +// Copyright 2014 Google Inc. All rights reserved. +// +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file or at +// https://developers.google.com/open-source/licenses/bsd #ifndef MEDIA_BASE_REQUEST_SIGNER_H_ #define MEDIA_BASE_REQUEST_SIGNER_H_ diff --git a/media/base/rsa_key.cc b/media/base/rsa_key.cc index 847743ab80..93747ec93c 100644 --- a/media/base/rsa_key.cc +++ b/media/base/rsa_key.cc @@ -1,6 +1,8 @@ -// Copyright (c) 2013 Google Inc. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. +// Copyright 2014 Google Inc. All rights reserved. +// +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file or at +// https://developers.google.com/open-source/licenses/bsd // // RSA signature details: // Algorithm: RSASSA-PSS diff --git a/media/base/rsa_key.h b/media/base/rsa_key.h index 64eb6f0620..df652011cc 100644 --- a/media/base/rsa_key.h +++ b/media/base/rsa_key.h @@ -1,6 +1,8 @@ -// Copyright (c) 2013 Google Inc. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. +// Copyright 2014 Google Inc. All rights reserved. +// +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file or at +// https://developers.google.com/open-source/licenses/bsd // // Declaration of classes representing RSA private and public keys used // for message signing, signature verification, encryption and decryption. diff --git a/media/base/rsa_key_unittest.cc b/media/base/rsa_key_unittest.cc index e7efd68f26..6cb07d1d37 100644 --- a/media/base/rsa_key_unittest.cc +++ b/media/base/rsa_key_unittest.cc @@ -1,6 +1,8 @@ -// Copyright (c) 2013 Google Inc. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. +// Copyright 2014 Google Inc. All rights reserved. +// +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file or at +// https://developers.google.com/open-source/licenses/bsd // // Unit test for rsa_key RSA encryption and signing. diff --git a/media/base/rsa_test_data.cc b/media/base/rsa_test_data.cc index 7255b2c00f..dca728c02e 100644 --- a/media/base/rsa_test_data.cc +++ b/media/base/rsa_test_data.cc @@ -1,6 +1,8 @@ -// Copyright (c) 2013 Google Inc. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. +// Copyright 2014 Google Inc. All rights reserved. +// +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file or at +// https://developers.google.com/open-source/licenses/bsd #include "media/base/rsa_test_data.h" diff --git a/media/base/rsa_test_data.h b/media/base/rsa_test_data.h index 17e278010e..6f76d6c63b 100644 --- a/media/base/rsa_test_data.h +++ b/media/base/rsa_test_data.h @@ -1,6 +1,8 @@ -// Copyright (c) 2013 Google Inc. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. +// Copyright 2014 Google Inc. All rights reserved. +// +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file or at +// https://developers.google.com/open-source/licenses/bsd // // RSA test data generated using fake_prng for purposes of testing. diff --git a/media/base/status.cc b/media/base/status.cc index 63d648b73f..05bdf7e3d6 100644 --- a/media/base/status.cc +++ b/media/base/status.cc @@ -1,6 +1,8 @@ -// Copyright (c) 2013 Google Inc. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. +// Copyright 2014 Google Inc. All rights reserved. +// +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file or at +// https://developers.google.com/open-source/licenses/bsd #include "media/base/status.h" diff --git a/media/base/status.h b/media/base/status.h index aa1d2113a6..55f13f3484 100644 --- a/media/base/status.h +++ b/media/base/status.h @@ -1,6 +1,8 @@ -// Copyright (c) 2013 Google Inc. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. +// Copyright 2014 Google Inc. All rights reserved. +// +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file or at +// https://developers.google.com/open-source/licenses/bsd #ifndef MEDIA_BASE_STATUS_H_ #define MEDIA_BASE_STATUS_H_ diff --git a/media/base/status_test_util.h b/media/base/status_test_util.h index 831f78371c..909db27520 100644 --- a/media/base/status_test_util.h +++ b/media/base/status_test_util.h @@ -1,6 +1,8 @@ -// Copyright (c) 2013 Google Inc. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. +// Copyright 2014 Google Inc. All rights reserved. +// +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file or at +// https://developers.google.com/open-source/licenses/bsd #ifndef MEDIA_BASE_STATUS_TEST_UTIL_H_ #define MEDIA_BASE_STATUS_TEST_UTIL_H_ diff --git a/media/base/status_test_util_unittest.cc b/media/base/status_test_util_unittest.cc index 3e1e07ed6b..f319af24f9 100644 --- a/media/base/status_test_util_unittest.cc +++ b/media/base/status_test_util_unittest.cc @@ -1,6 +1,8 @@ -// Copyright (c) 2013 Google Inc. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. +// Copyright 2014 Google Inc. All rights reserved. +// +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file or at +// https://developers.google.com/open-source/licenses/bsd #include "media/base/status_test_util.h" diff --git a/media/base/status_unittest.cc b/media/base/status_unittest.cc index ba678384f1..480babdbf0 100644 --- a/media/base/status_unittest.cc +++ b/media/base/status_unittest.cc @@ -1,6 +1,8 @@ -// Copyright (c) 2013 Google Inc. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. +// Copyright 2014 Google Inc. All rights reserved. +// +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file or at +// https://developers.google.com/open-source/licenses/bsd #include "media/base/status.h" diff --git a/media/base/stream_info.cc b/media/base/stream_info.cc index e8c6cbf327..ccba8543c2 100644 --- a/media/base/stream_info.cc +++ b/media/base/stream_info.cc @@ -1,6 +1,8 @@ -// Copyright (c) 2013 Google Inc. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. +// Copyright 2014 Google Inc. All rights reserved. +// +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file or at +// https://developers.google.com/open-source/licenses/bsd #include "media/base/stream_info.h" diff --git a/media/base/stream_info.h b/media/base/stream_info.h index 21cac2700d..bb2652824c 100644 --- a/media/base/stream_info.h +++ b/media/base/stream_info.h @@ -1,6 +1,8 @@ -// Copyright (c) 2013 Google Inc. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. +// Copyright 2014 Google Inc. All rights reserved. +// +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file or at +// https://developers.google.com/open-source/licenses/bsd #ifndef MEDIA_BASE_STREAM_INFO_H_ #define MEDIA_BASE_STREAM_INFO_H_ diff --git a/media/base/video_stream_info.cc b/media/base/video_stream_info.cc index 6f610e5891..2e33885fdc 100644 --- a/media/base/video_stream_info.cc +++ b/media/base/video_stream_info.cc @@ -1,6 +1,8 @@ -// Copyright (c) 2013 Google Inc. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. +// Copyright 2014 Google Inc. All rights reserved. +// +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file or at +// https://developers.google.com/open-source/licenses/bsd #include "media/base/video_stream_info.h" diff --git a/media/base/video_stream_info.h b/media/base/video_stream_info.h index 3cf63c202e..b1718ebb42 100644 --- a/media/base/video_stream_info.h +++ b/media/base/video_stream_info.h @@ -1,6 +1,8 @@ -// Copyright (c) 2013 Google Inc. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. +// Copyright 2014 Google Inc. All rights reserved. +// +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file or at +// https://developers.google.com/open-source/licenses/bsd #ifndef MEDIA_BASE_VIDEO_STREAM_INFO_H_ #define MEDIA_BASE_VIDEO_STREAM_INFO_H_ diff --git a/media/base/widevine_encryptor_source.cc b/media/base/widevine_encryptor_source.cc index 2213075dd2..fdcf88b30c 100644 --- a/media/base/widevine_encryptor_source.cc +++ b/media/base/widevine_encryptor_source.cc @@ -1,6 +1,8 @@ -// Copyright (c) 2013 Google Inc. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. +// Copyright 2014 Google Inc. All rights reserved. +// +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file or at +// https://developers.google.com/open-source/licenses/bsd #include "media/base/widevine_encryptor_source.h" diff --git a/media/base/widevine_encryptor_source.h b/media/base/widevine_encryptor_source.h index 86b24e0507..a2f1c1cf18 100644 --- a/media/base/widevine_encryptor_source.h +++ b/media/base/widevine_encryptor_source.h @@ -1,6 +1,8 @@ -// Copyright (c) 2013 Google Inc. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. +// Copyright 2014 Google Inc. All rights reserved. +// +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file or at +// https://developers.google.com/open-source/licenses/bsd #ifndef MEDIA_BASE_WIDEVINE_ENCRYPTOR_SOURCE_H_ #define MEDIA_BASE_WIDEVINE_ENCRYPTOR_SOURCE_H_ diff --git a/media/event/media_event.gyp b/media/event/media_event.gyp index 2f632ee584..a620d3a89d 100644 --- a/media/event/media_event.gyp +++ b/media/event/media_event.gyp @@ -1,6 +1,8 @@ -# Copyright (c) 2013 Google Inc. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. +# Copyright 2014 Google Inc. All rights reserved. +# +# Use of this source code is governed by a BSD-style +# license that can be found in the LICENSE file or at +# https://developers.google.com/open-source/licenses/bsd { 'target_defaults': { diff --git a/media/event/muxer_listener.h b/media/event/muxer_listener.h index 9220b1bb77..f8e646bfe8 100644 --- a/media/event/muxer_listener.h +++ b/media/event/muxer_listener.h @@ -1,4 +1,11 @@ +// Copyright 2014 Google Inc. All rights reserved. +// +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file or at +// https://developers.google.com/open-source/licenses/bsd +// // Event handler for events fired by Muxer. + #ifndef MEDIA_EVENT_MUXER_LISTENER_H_ #define MEDIA_EVENT_MUXER_LISTENER_H_ diff --git a/media/event/vod_media_info_dump_muxer_listener.cc b/media/event/vod_media_info_dump_muxer_listener.cc index 604ce2543b..024b3e6853 100644 --- a/media/event/vod_media_info_dump_muxer_listener.cc +++ b/media/event/vod_media_info_dump_muxer_listener.cc @@ -1,3 +1,9 @@ +// Copyright 2014 Google Inc. All rights reserved. +// +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file or at +// https://developers.google.com/open-source/licenses/bsd + #include "media/event/vod_media_info_dump_muxer_listener.h" #include "base/logging.h" diff --git a/media/event/vod_media_info_dump_muxer_listener.h b/media/event/vod_media_info_dump_muxer_listener.h index b527b58ac2..35c0883f39 100644 --- a/media/event/vod_media_info_dump_muxer_listener.h +++ b/media/event/vod_media_info_dump_muxer_listener.h @@ -1,6 +1,13 @@ +// Copyright 2014 Google Inc. All rights reserved. +// +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file or at +// https://developers.google.com/open-source/licenses/bsd +// // Implementation of MuxerListener that converts the info to a MediaInfo // protobuf and dumps it to a file. // This is specifically for VOD. + #ifndef MEDIA_EVENT_VOD_MEDIA_INFO_DUMP_MUXER_LISTENER_H_ #define MEDIA_EVENT_VOD_MEDIA_INFO_DUMP_MUXER_LISTENER_H_ diff --git a/media/event/vod_media_info_dump_muxer_listener_unittest.cc b/media/event/vod_media_info_dump_muxer_listener_unittest.cc index c9b8bb7b48..30796cc97a 100644 --- a/media/event/vod_media_info_dump_muxer_listener_unittest.cc +++ b/media/event/vod_media_info_dump_muxer_listener_unittest.cc @@ -1,3 +1,9 @@ +// Copyright 2014 Google Inc. All rights reserved. +// +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file or at +// https://developers.google.com/open-source/licenses/bsd + #include #include "base/file_util.h" diff --git a/media/event/vod_mpd_notify_muxer_listener.cc b/media/event/vod_mpd_notify_muxer_listener.cc index de91a7f1e8..cf18e12938 100644 --- a/media/event/vod_mpd_notify_muxer_listener.cc +++ b/media/event/vod_mpd_notify_muxer_listener.cc @@ -1,3 +1,9 @@ +// Copyright 2014 Google Inc. All rights reserved. +// +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file or at +// https://developers.google.com/open-source/licenses/bsd + #include "media/event/vod_mpd_notify_muxer_listener.h" #include diff --git a/media/event/vod_mpd_notify_muxer_listener.h b/media/event/vod_mpd_notify_muxer_listener.h index d5ee5bb9fd..3928839253 100644 --- a/media/event/vod_mpd_notify_muxer_listener.h +++ b/media/event/vod_mpd_notify_muxer_listener.h @@ -1,4 +1,11 @@ +// Copyright 2014 Google Inc. All rights reserved. +// +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file or at +// https://developers.google.com/open-source/licenses/bsd +// // Implementation of MuxerListener that deals with MpdNotifier. + #ifndef MEDIA_EVENT_VOD_MPD_NOTIFY_MUXER_LISTENER_H_ #define MEDIA_EVENT_VOD_MPD_NOTIFY_MUXER_LISTENER_H_ diff --git a/media/event/vod_muxer_listener_internal.cc b/media/event/vod_muxer_listener_internal.cc index 110734e395..09c80fc95d 100644 --- a/media/event/vod_muxer_listener_internal.cc +++ b/media/event/vod_muxer_listener_internal.cc @@ -1,3 +1,9 @@ +// Copyright 2014 Google Inc. All rights reserved. +// +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file or at +// https://developers.google.com/open-source/licenses/bsd + #include "media/event/vod_muxer_listener_internal.h" #include diff --git a/media/event/vod_muxer_listener_internal.h b/media/event/vod_muxer_listener_internal.h index 5b85be2e0a..5f4c03dd91 100644 --- a/media/event/vod_muxer_listener_internal.h +++ b/media/event/vod_muxer_listener_internal.h @@ -1,3 +1,9 @@ +// Copyright 2014 Google Inc. All rights reserved. +// +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file or at +// https://developers.google.com/open-source/licenses/bsd + #ifndef MEDIA_EVENT_VOD_MUXER_LISTENER_INTERNAL_H_ #define MEDIA_EVENT_VOD_MUXER_LISTENER_INTERNAL_H_ diff --git a/media/file/file.cc b/media/file/file.cc index 1920f1d764..bea5a06b64 100644 --- a/media/file/file.cc +++ b/media/file/file.cc @@ -1,6 +1,8 @@ -// Copyright (c) 2013 Google Inc. All rights reserved. -// Use of this source code is governed by a BSD-style license tha can be -// found in the LICENSE file. +// Copyright 2014 Google Inc. All rights reserved. +// +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file or at +// https://developers.google.com/open-source/licenses/bsd #include "media/file/file.h" diff --git a/media/file/file.gyp b/media/file/file.gyp index b4789c3e8c..36014f7dd3 100644 --- a/media/file/file.gyp +++ b/media/file/file.gyp @@ -1,6 +1,8 @@ -# Copyright (c) 2013 Google Inc. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. +# Copyright 2014 Google Inc. All rights reserved. +# +# Use of this source code is governed by a BSD-style +# license that can be found in the LICENSE file or at +# https://developers.google.com/open-source/licenses/bsd { 'target_defaults': { diff --git a/media/file/file.h b/media/file/file.h index 5b33990112..373c68a658 100644 --- a/media/file/file.h +++ b/media/file/file.h @@ -1,6 +1,8 @@ -// Copyright (c) 2013 Google Inc. All rights reserved. -// Use of this source code is governed by a BSD-style license tha can be -// found in the LICENSE file. +// Copyright 2014 Google Inc. All rights reserved. +// +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file or at +// https://developers.google.com/open-source/licenses/bsd // // Defines an abstract file interface. diff --git a/media/file/file_closer.h b/media/file/file_closer.h index fcbc8e7101..93c195d81a 100644 --- a/media/file/file_closer.h +++ b/media/file/file_closer.h @@ -1,6 +1,8 @@ -// Copyright (c) 2013 Google Inc. All rights reserved. -// Use of this source code is governed by a BSD-style license tha can be -// found in the LICENSE file. +// Copyright 2014 Google Inc. All rights reserved. +// +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file or at +// https://developers.google.com/open-source/licenses/bsd #ifndef MEDIA_FILE_FILE_CLOSER_H_ #define MEDIA_FILE_FILE_CLOSER_H_ diff --git a/media/file/file_unittest.cc b/media/file/file_unittest.cc index 8e9e557098..3eee7b10b8 100644 --- a/media/file/file_unittest.cc +++ b/media/file/file_unittest.cc @@ -1,6 +1,8 @@ -// Copyright (c) 2013 Google Inc. All rights reserved. -// Use of this source code is governed by a BSD-style license tha can be -// found in the LICENSE file. +// Copyright 2014 Google Inc. All rights reserved. +// +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file or at +// https://developers.google.com/open-source/licenses/bsd #include "media/file/file.h" diff --git a/media/file/local_file.cc b/media/file/local_file.cc index e5db3f8883..c5c9edeb70 100644 --- a/media/file/local_file.cc +++ b/media/file/local_file.cc @@ -1,6 +1,8 @@ -// Copyright (c) 2013 Google Inc. All rights reserved. -// Use of this source code is governed by a BSD-style license tha can be -// found in the LICENSE file. +// Copyright 2014 Google Inc. All rights reserved. +// +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file or at +// https://developers.google.com/open-source/licenses/bsd #include "media/file/local_file.h" diff --git a/media/file/local_file.h b/media/file/local_file.h index 2a7376c67d..bce68f6a51 100644 --- a/media/file/local_file.h +++ b/media/file/local_file.h @@ -1,6 +1,8 @@ -// Copyright (c) 2013 Google Inc. All rights reserved. -// Use of this source code is governed by a BSD-style license tha can be -// found in the LICENSE file. +// Copyright 2014 Google Inc. All rights reserved. +// +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file or at +// https://developers.google.com/open-source/licenses/bsd // // Implements LocalFile. diff --git a/media/mp4/box.cc b/media/mp4/box.cc index f8d27bf09b..33ed16667f 100644 --- a/media/mp4/box.cc +++ b/media/mp4/box.cc @@ -1,6 +1,8 @@ -// Copyright (c) 2013 Google Inc. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. +// Copyright 2014 Google Inc. All rights reserved. +// +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file or at +// https://developers.google.com/open-source/licenses/bsd #include "media/mp4/box.h" diff --git a/media/mp4/box.h b/media/mp4/box.h index f8466dc155..49fda6a0f3 100644 --- a/media/mp4/box.h +++ b/media/mp4/box.h @@ -1,6 +1,8 @@ -// Copyright (c) 2013 Google Inc. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. +// Copyright 2014 Google Inc. All rights reserved. +// +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file or at +// https://developers.google.com/open-source/licenses/bsd #ifndef MEDIA_MP4_BOX_H_ #define MEDIA_MP4_BOX_H_ diff --git a/media/mp4/box_buffer.h b/media/mp4/box_buffer.h index 101e915e8c..e0e4a712b0 100644 --- a/media/mp4/box_buffer.h +++ b/media/mp4/box_buffer.h @@ -1,6 +1,8 @@ -// Copyright (c) 2013 Google Inc. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. +// Copyright 2014 Google Inc. All rights reserved. +// +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file or at +// https://developers.google.com/open-source/licenses/bsd #ifndef MEDIA_MP4_BOX_BUFFER_H_ #define MEDIA_MP4_BOX_BUFFER_H_ diff --git a/media/mp4/box_definitions_comparison.h b/media/mp4/box_definitions_comparison.h index 396472c5fe..5441ae3718 100644 --- a/media/mp4/box_definitions_comparison.h +++ b/media/mp4/box_definitions_comparison.h @@ -1,6 +1,8 @@ -// Copyright (c) 2013 Google Inc. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. +// Copyright 2014 Google Inc. All rights reserved. +// +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file or at +// https://developers.google.com/open-source/licenses/bsd // // Overloads operator== for mp4 boxes, mainly used for testing. diff --git a/media/mp4/box_definitions_unittest.cc b/media/mp4/box_definitions_unittest.cc index 2b6091dc3e..5169fa4a06 100644 --- a/media/mp4/box_definitions_unittest.cc +++ b/media/mp4/box_definitions_unittest.cc @@ -1,6 +1,8 @@ -// Copyright (c) 2013 Google Inc. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. +// Copyright 2014 Google Inc. All rights reserved. +// +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file or at +// https://developers.google.com/open-source/licenses/bsd #include "media/mp4/box_definitions.h" diff --git a/media/mp4/chunk_info_iterator.cc b/media/mp4/chunk_info_iterator.cc index 50f3a8b91a..0edb841849 100644 --- a/media/mp4/chunk_info_iterator.cc +++ b/media/mp4/chunk_info_iterator.cc @@ -1,6 +1,8 @@ -// Copyright (c) 2013 Google Inc. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. +// Copyright 2014 Google Inc. All rights reserved. +// +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file or at +// https://developers.google.com/open-source/licenses/bsd #include "media/mp4/chunk_info_iterator.h" diff --git a/media/mp4/chunk_info_iterator.h b/media/mp4/chunk_info_iterator.h index 02c0a6f960..32b4ecb38f 100644 --- a/media/mp4/chunk_info_iterator.h +++ b/media/mp4/chunk_info_iterator.h @@ -1,6 +1,8 @@ -// Copyright (c) 2013 Google Inc. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. +// Copyright 2014 Google Inc. All rights reserved. +// +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file or at +// https://developers.google.com/open-source/licenses/bsd // // Implements a wrapper around Sample to Chunk Box (STSC) to iterate through // the compressed table by sample/chunk. This class also provides a convenient diff --git a/media/mp4/chunk_info_iterator_unittest.cc b/media/mp4/chunk_info_iterator_unittest.cc index b8e5d6b633..08c997e3db 100644 --- a/media/mp4/chunk_info_iterator_unittest.cc +++ b/media/mp4/chunk_info_iterator_unittest.cc @@ -1,6 +1,8 @@ -// Copyright (c) 2013 Google Inc. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. +// Copyright 2014 Google Inc. All rights reserved. +// +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file or at +// https://developers.google.com/open-source/licenses/bsd #include "media/mp4/chunk_info_iterator.h" diff --git a/media/mp4/composition_offset_iterator.cc b/media/mp4/composition_offset_iterator.cc index 84a396dd18..c8d37015c8 100644 --- a/media/mp4/composition_offset_iterator.cc +++ b/media/mp4/composition_offset_iterator.cc @@ -1,6 +1,8 @@ -// Copyright (c) 2013 Google Inc. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. +// Copyright 2014 Google Inc. All rights reserved. +// +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file or at +// https://developers.google.com/open-source/licenses/bsd #include "media/mp4/composition_offset_iterator.h" diff --git a/media/mp4/composition_offset_iterator.h b/media/mp4/composition_offset_iterator.h index 9d55381353..4d3f4d7cd2 100644 --- a/media/mp4/composition_offset_iterator.h +++ b/media/mp4/composition_offset_iterator.h @@ -1,6 +1,8 @@ -// Copyright (c) 2013 Google Inc. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. +// Copyright 2014 Google Inc. All rights reserved. +// +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file or at +// https://developers.google.com/open-source/licenses/bsd // // Implements a wrapper around Composition Time to Sample Box (CTTS) to iterate // through the compressed table. This class also provides convenient functions diff --git a/media/mp4/composition_offset_iterator_unittest.cc b/media/mp4/composition_offset_iterator_unittest.cc index 7637d0850d..848070c44b 100644 --- a/media/mp4/composition_offset_iterator_unittest.cc +++ b/media/mp4/composition_offset_iterator_unittest.cc @@ -1,6 +1,8 @@ -// Copyright (c) 2013 Google Inc. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. +// Copyright 2014 Google Inc. All rights reserved. +// +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file or at +// https://developers.google.com/open-source/licenses/bsd #include "media/mp4/composition_offset_iterator.h" diff --git a/media/mp4/decoding_time_iterator.cc b/media/mp4/decoding_time_iterator.cc index 80e57f2ca9..0a96d19826 100644 --- a/media/mp4/decoding_time_iterator.cc +++ b/media/mp4/decoding_time_iterator.cc @@ -1,6 +1,8 @@ -// Copyright (c) 2013 Google Inc. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. +// Copyright 2014 Google Inc. All rights reserved. +// +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file or at +// https://developers.google.com/open-source/licenses/bsd #include "media/mp4/decoding_time_iterator.h" diff --git a/media/mp4/decoding_time_iterator.h b/media/mp4/decoding_time_iterator.h index 3ac5ba9c57..4333a88623 100644 --- a/media/mp4/decoding_time_iterator.h +++ b/media/mp4/decoding_time_iterator.h @@ -1,6 +1,8 @@ -// Copyright (c) 2013 Google Inc. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. +// Copyright 2014 Google Inc. All rights reserved. +// +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file or at +// https://developers.google.com/open-source/licenses/bsd // // Implements a wrapper around Decoding Time to Sample Box (STTS) to iterate // through the compressed table. This class also provides convenient functions diff --git a/media/mp4/decoding_time_iterator_unittest.cc b/media/mp4/decoding_time_iterator_unittest.cc index a37b2b6402..5bb30964a8 100644 --- a/media/mp4/decoding_time_iterator_unittest.cc +++ b/media/mp4/decoding_time_iterator_unittest.cc @@ -1,6 +1,8 @@ -// Copyright (c) 2013 Google Inc. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. +// Copyright 2014 Google Inc. All rights reserved. +// +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file or at +// https://developers.google.com/open-source/licenses/bsd #include "media/mp4/decoding_time_iterator.h" diff --git a/media/mp4/mp4.gyp b/media/mp4/mp4.gyp index d73b55a52e..f3b27732b9 100644 --- a/media/mp4/mp4.gyp +++ b/media/mp4/mp4.gyp @@ -1,6 +1,8 @@ -# Copyright (c) 2013 Google Inc. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. +# Copyright 2014 Google Inc. All rights reserved. +# +# Use of this source code is governed by a BSD-style +# license that can be found in the LICENSE file or at +# https://developers.google.com/open-source/licenses/bsd { 'target_defaults': { diff --git a/media/mp4/mp4_fragmenter.cc b/media/mp4/mp4_fragmenter.cc index 468704607e..c83b592300 100644 --- a/media/mp4/mp4_fragmenter.cc +++ b/media/mp4/mp4_fragmenter.cc @@ -1,6 +1,8 @@ -// Copyright (c) 2013 Google Inc. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. +// Copyright 2014 Google Inc. All rights reserved. +// +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file or at +// https://developers.google.com/open-source/licenses/bsd #include "media/mp4/mp4_fragmenter.h" diff --git a/media/mp4/mp4_fragmenter.h b/media/mp4/mp4_fragmenter.h index fc78ad6236..94ab666324 100644 --- a/media/mp4/mp4_fragmenter.h +++ b/media/mp4/mp4_fragmenter.h @@ -1,6 +1,8 @@ -// Copyright (c) 2013 Google Inc. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. +// Copyright 2014 Google Inc. All rights reserved. +// +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file or at +// https://developers.google.com/open-source/licenses/bsd // // MP4Fragmenter is responsible for the generation of MP4 fragments, i.e. traf // and the corresponding mdat. The samples are also encrypted if encryption is diff --git a/media/mp4/mp4_general_segmenter.cc b/media/mp4/mp4_general_segmenter.cc index 9e38f3f911..8ed7eaca8e 100644 --- a/media/mp4/mp4_general_segmenter.cc +++ b/media/mp4/mp4_general_segmenter.cc @@ -1,6 +1,8 @@ -// Copyright (c) 2013 Google Inc. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. +// Copyright 2014 Google Inc. All rights reserved. +// +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file or at +// https://developers.google.com/open-source/licenses/bsd #include "media/mp4/mp4_general_segmenter.h" diff --git a/media/mp4/mp4_general_segmenter.h b/media/mp4/mp4_general_segmenter.h index 2a2ecddd39..2bee7655f9 100644 --- a/media/mp4/mp4_general_segmenter.h +++ b/media/mp4/mp4_general_segmenter.h @@ -1,6 +1,8 @@ -// Copyright (c) 2013 Google Inc. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. +// Copyright 2014 Google Inc. All rights reserved. +// +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file or at +// https://developers.google.com/open-source/licenses/bsd // // Segmenter for MP4 live, main and simple profiles. The generated media file // could contain one to many segments with segment duration defined by diff --git a/media/mp4/mp4_media_parser.h b/media/mp4/mp4_media_parser.h index aeabd48a96..e6252957de 100644 --- a/media/mp4/mp4_media_parser.h +++ b/media/mp4/mp4_media_parser.h @@ -1,6 +1,8 @@ -// Copyright (c) 2013 Google Inc. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. +// Copyright 2014 Google Inc. All rights reserved. +// +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file or at +// https://developers.google.com/open-source/licenses/bsd #ifndef MEDIA_MP4_MP4_MEDIA_PARSER_H_ #define MEDIA_MP4_MP4_MEDIA_PARSER_H_ diff --git a/media/mp4/mp4_media_parser_unittest.cc b/media/mp4/mp4_media_parser_unittest.cc index b05bd3c8d0..b92fb8a898 100644 --- a/media/mp4/mp4_media_parser_unittest.cc +++ b/media/mp4/mp4_media_parser_unittest.cc @@ -1,6 +1,8 @@ -// Copyright (c) 2013 Google Inc. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. +// Copyright 2014 Google Inc. All rights reserved. +// +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file or at +// https://developers.google.com/open-source/licenses/bsd #include "media/mp4/mp4_media_parser.h" diff --git a/media/mp4/mp4_muxer.cc b/media/mp4/mp4_muxer.cc index 74d0217dc9..179102a3d4 100644 --- a/media/mp4/mp4_muxer.cc +++ b/media/mp4/mp4_muxer.cc @@ -1,6 +1,8 @@ -// Copyright (c) 2013 Google Inc. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. +// Copyright 2014 Google Inc. All rights reserved. +// +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file or at +// https://developers.google.com/open-source/licenses/bsd #include "media/mp4/mp4_muxer.h" diff --git a/media/mp4/mp4_muxer.h b/media/mp4/mp4_muxer.h index 7c79974e66..a41d9af4eb 100644 --- a/media/mp4/mp4_muxer.h +++ b/media/mp4/mp4_muxer.h @@ -1,6 +1,8 @@ -// Copyright (c) 2013 Google Inc. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. +// Copyright 2014 Google Inc. All rights reserved. +// +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file or at +// https://developers.google.com/open-source/licenses/bsd // // Implements MP4 Muxer. diff --git a/media/mp4/mp4_segmenter.cc b/media/mp4/mp4_segmenter.cc index d4a573bf9a..53c7c87003 100644 --- a/media/mp4/mp4_segmenter.cc +++ b/media/mp4/mp4_segmenter.cc @@ -1,6 +1,8 @@ -// Copyright (c) 2013 Google Inc. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. +// Copyright 2014 Google Inc. All rights reserved. +// +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file or at +// https://developers.google.com/open-source/licenses/bsd #include "media/mp4/mp4_segmenter.h" diff --git a/media/mp4/mp4_segmenter.h b/media/mp4/mp4_segmenter.h index c70a5c8dee..33277b475d 100644 --- a/media/mp4/mp4_segmenter.h +++ b/media/mp4/mp4_segmenter.h @@ -1,6 +1,8 @@ -// Copyright (c) 2013 Google Inc. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. +// Copyright 2014 Google Inc. All rights reserved. +// +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file or at +// https://developers.google.com/open-source/licenses/bsd // // This class defines the MP4 Segmenter which is responsible for organizing // MP4 fragments into segments/subsegments and package into a MP4 file. diff --git a/media/mp4/mp4_vod_segmenter.cc b/media/mp4/mp4_vod_segmenter.cc index aa67c0040c..31d316388d 100644 --- a/media/mp4/mp4_vod_segmenter.cc +++ b/media/mp4/mp4_vod_segmenter.cc @@ -1,6 +1,8 @@ -// Copyright (c) 2013 Google Inc. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. +// Copyright 2014 Google Inc. All rights reserved. +// +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file or at +// https://developers.google.com/open-source/licenses/bsd #include "media/mp4/mp4_vod_segmenter.h" diff --git a/media/mp4/mp4_vod_segmenter.h b/media/mp4/mp4_vod_segmenter.h index 0ba5cfd558..7ec785a1ed 100644 --- a/media/mp4/mp4_vod_segmenter.h +++ b/media/mp4/mp4_vod_segmenter.h @@ -1,6 +1,8 @@ -// Copyright (c) 2013 Google Inc. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. +// Copyright 2014 Google Inc. All rights reserved. +// +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file or at +// https://developers.google.com/open-source/licenses/bsd // // Segmenter for MP4 Dash Video-On-Demand profile. A single MP4 file with a // single segment is created, i.e. with only one SIDX box. The generated media diff --git a/media/mp4/sync_sample_iterator.cc b/media/mp4/sync_sample_iterator.cc index 7036a9698d..b284f22891 100644 --- a/media/mp4/sync_sample_iterator.cc +++ b/media/mp4/sync_sample_iterator.cc @@ -1,6 +1,8 @@ -// Copyright (c) 2013 Google Inc. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. +// Copyright 2014 Google Inc. All rights reserved. +// +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file or at +// https://developers.google.com/open-source/licenses/bsd #include "media/mp4/sync_sample_iterator.h" diff --git a/media/mp4/sync_sample_iterator.h b/media/mp4/sync_sample_iterator.h index 3d44de434f..a59694f351 100644 --- a/media/mp4/sync_sample_iterator.h +++ b/media/mp4/sync_sample_iterator.h @@ -1,6 +1,8 @@ -// Copyright (c) 2013 Google Inc. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. +// Copyright 2014 Google Inc. All rights reserved. +// +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file or at +// https://developers.google.com/open-source/licenses/bsd // // Implements a wrapper around Sync Sample Box (STSS) to iterate through the // compressed table. diff --git a/media/mp4/sync_sample_iterator_unittest.cc b/media/mp4/sync_sample_iterator_unittest.cc index 36c428327b..59ec73bc9d 100644 --- a/media/mp4/sync_sample_iterator_unittest.cc +++ b/media/mp4/sync_sample_iterator_unittest.cc @@ -1,6 +1,8 @@ -// Copyright (c) 2013 Google Inc. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. +// Copyright 2014 Google Inc. All rights reserved. +// +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file or at +// https://developers.google.com/open-source/licenses/bsd #include "media/mp4/sync_sample_iterator.h" diff --git a/media/test/media_test.gyp b/media/test/media_test.gyp index bdd5a3ed89..20e1ed6e79 100644 --- a/media/test/media_test.gyp +++ b/media/test/media_test.gyp @@ -1,6 +1,8 @@ -# Copyright (c) 2013 Google Inc. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. +# Copyright 2014 Google Inc. All rights reserved. +# +# Use of this source code is governed by a BSD-style +# license that can be found in the LICENSE file or at +# https://developers.google.com/open-source/licenses/bsd { 'target_defaults': { diff --git a/media/test/packager_test.cc b/media/test/packager_test.cc index ae4ab10db5..49de6c727a 100644 --- a/media/test/packager_test.cc +++ b/media/test/packager_test.cc @@ -1,6 +1,8 @@ -// Copyright (c) 2013 Google Inc. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. +// Copyright 2014 Google Inc. All rights reserved. +// +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file or at +// https://developers.google.com/open-source/licenses/bsd #include "base/file_util.h" #include "base/strings/string_number_conversions.h" diff --git a/media/test/run_tests_with_atexit_manager.cc b/media/test/run_tests_with_atexit_manager.cc index 5e7dafaa24..000792ef7e 100644 --- a/media/test/run_tests_with_atexit_manager.cc +++ b/media/test/run_tests_with_atexit_manager.cc @@ -1,6 +1,8 @@ -// Copyright (c) 2013 Google Inc. All rights reserved. -// Use of this source code is governed by a BSD-style license tha can be -// found in the LICENSE file. +// Copyright 2014 Google Inc. All rights reserved. +// +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file or at +// https://developers.google.com/open-source/licenses/bsd #include "base/at_exit.h" #include "base/command_line.h" diff --git a/mpd/base/content_protection_element.cc b/mpd/base/content_protection_element.cc index 8d33af383d..1247284ad4 100644 --- a/mpd/base/content_protection_element.cc +++ b/mpd/base/content_protection_element.cc @@ -1,3 +1,9 @@ +// Copyright 2014 Google Inc. All rights reserved. +// +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file or at +// https://developers.google.com/open-source/licenses/bsd + #include "mpd/base/content_protection_element.h" namespace dash_packager { diff --git a/mpd/base/content_protection_element.h b/mpd/base/content_protection_element.h index 69f5191e2d..121d240902 100644 --- a/mpd/base/content_protection_element.h +++ b/mpd/base/content_protection_element.h @@ -1,3 +1,9 @@ +// Copyright 2014 Google Inc. All rights reserved. +// +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file or at +// https://developers.google.com/open-source/licenses/bsd +// // ContentProtectionElement is shared a structure that can be passed to // MPD generator classes to add ContentProtection element in the resulting MPD // file. diff --git a/mpd/base/mpd_builder.cc b/mpd/base/mpd_builder.cc index e0cdbb4345..fd6add49a2 100644 --- a/mpd/base/mpd_builder.cc +++ b/mpd/base/mpd_builder.cc @@ -1,3 +1,9 @@ +// Copyright 2014 Google Inc. All rights reserved. +// +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file or at +// https://developers.google.com/open-source/licenses/bsd + #include "mpd/base/mpd_builder.h" #include diff --git a/mpd/base/mpd_builder.h b/mpd/base/mpd_builder.h index bbd8fe822a..a15b26044a 100644 --- a/mpd/base/mpd_builder.h +++ b/mpd/base/mpd_builder.h @@ -1,3 +1,9 @@ +// Copyright 2014 Google Inc. All rights reserved. +// +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file or at +// https://developers.google.com/open-source/licenses/bsd +// // This file contains the MpdBuilder, AdaptationSet, and Representation class // declarations. // http://goo.gl/UrsSlF diff --git a/mpd/base/mpd_builder_unittest.cc b/mpd/base/mpd_builder_unittest.cc index 619b2a6211..edf9f78ce7 100644 --- a/mpd/base/mpd_builder_unittest.cc +++ b/mpd/base/mpd_builder_unittest.cc @@ -1,3 +1,9 @@ +// Copyright 2014 Google Inc. All rights reserved. +// +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file or at +// https://developers.google.com/open-source/licenses/bsd + #include "base/file_util.h" #include "base/logging.h" #include "base/path_service.h" diff --git a/mpd/base/mpd_notifier.h b/mpd/base/mpd_notifier.h index ae93d3e554..35158564d2 100644 --- a/mpd/base/mpd_notifier.h +++ b/mpd/base/mpd_notifier.h @@ -1,5 +1,12 @@ +// Copyright 2014 Google Inc. All rights reserved. +// +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file or at +// https://developers.google.com/open-source/licenses/bsd +// // MpdNotifier is responsible for notifying the MpdBuilder class to generate an // MPD file. + #ifndef MPD_BASE_MPD_NOTIFIER_H_ #define MPD_BASE_MPD_NOTIFIER_H_ diff --git a/mpd/base/mpd_utils.cc b/mpd/base/mpd_utils.cc index 351f878fb2..7f6bb34e27 100644 --- a/mpd/base/mpd_utils.cc +++ b/mpd/base/mpd_utils.cc @@ -1,3 +1,9 @@ +// Copyright 2014 Google Inc. All rights reserved. +// +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file or at +// https://developers.google.com/open-source/licenses/bsd + #include "mpd/base/mpd_utils.h" #include diff --git a/mpd/base/mpd_utils.h b/mpd/base/mpd_utils.h index 7035024faa..6f0d34b84e 100644 --- a/mpd/base/mpd_utils.h +++ b/mpd/base/mpd_utils.h @@ -1,4 +1,11 @@ +// Copyright 2014 Google Inc. All rights reserved. +// +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file or at +// https://developers.google.com/open-source/licenses/bsd +// // Funtions used by MpdBuilder class to generate an MPD file. + #ifndef MPD_BASE_MPD_UTILS_H_ #define MPD_BASE_MPD_UTILS_H_ diff --git a/mpd/base/simple_vod_mpd_notifier.cc b/mpd/base/simple_vod_mpd_notifier.cc index 2b82e6037c..f6a5123f75 100644 --- a/mpd/base/simple_vod_mpd_notifier.cc +++ b/mpd/base/simple_vod_mpd_notifier.cc @@ -1,3 +1,9 @@ +// Copyright 2014 Google Inc. All rights reserved. +// +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file or at +// https://developers.google.com/open-source/licenses/bsd + #include "mpd/base/simple_vod_mpd_notifier.h" #include "base/stl_util.h" diff --git a/mpd/base/simple_vod_mpd_notifier.h b/mpd/base/simple_vod_mpd_notifier.h index 24bae8b690..afe122b8d6 100644 --- a/mpd/base/simple_vod_mpd_notifier.h +++ b/mpd/base/simple_vod_mpd_notifier.h @@ -1,5 +1,12 @@ +// Copyright 2014 Google Inc. All rights reserved. +// +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file or at +// https://developers.google.com/open-source/licenses/bsd +// // Very simple implementation of MpdNotifier. Holds an instance of MpdBuilder // and calls methods on the object directly. + #ifndef MPD_BASE_SIMPLE_MPD_NOTIFIER_H_ #define MPD_BASE_SIMPLE_MPD_NOTIFIER_H_ diff --git a/mpd/base/xml/scoped_xml_ptr.h b/mpd/base/xml/scoped_xml_ptr.h index 051290751d..cf10a5af23 100644 --- a/mpd/base/xml/scoped_xml_ptr.h +++ b/mpd/base/xml/scoped_xml_ptr.h @@ -1,5 +1,12 @@ +// Copyright 2014 Google Inc. All rights reserved. +// +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file or at +// https://developers.google.com/open-source/licenses/bsd +// // scoped_ptr alias for libxml2 objects. Deleters for the objects are also // defined in this file. + #ifndef MPD_BASE_XML_SCOPED_XML_PTR_H_ #define MPD_BASE_XML_SCOPED_XML_PTR_H_ diff --git a/mpd/base/xml/xml_node.cc b/mpd/base/xml/xml_node.cc index dc07d2fff5..e932053ff0 100644 --- a/mpd/base/xml/xml_node.cc +++ b/mpd/base/xml/xml_node.cc @@ -1,3 +1,9 @@ +// Copyright 2014 Google Inc. All rights reserved. +// +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file or at +// https://developers.google.com/open-source/licenses/bsd + #include "mpd/base/xml/xml_node.h" #include diff --git a/mpd/base/xml/xml_node.h b/mpd/base/xml/xml_node.h index 04b88ccb3e..7e37fec65c 100644 --- a/mpd/base/xml/xml_node.h +++ b/mpd/base/xml/xml_node.h @@ -1,5 +1,12 @@ +// Copyright 2014 Google Inc. All rights reserved. +// +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file or at +// https://developers.google.com/open-source/licenses/bsd +// // Classes to wrap XML operations. XmlNode is a generic wrapper class for // XmlNode in libxml2. There are also MPD XML specific classes as well. + #ifndef MPD_BASE_XML_XML_NODE_H_ #define MPD_BASE_XML_XML_NODE_H_ diff --git a/mpd/base/xml/xml_node_unittest.cc b/mpd/base/xml/xml_node_unittest.cc index 7793f3fb63..9d7043ae4c 100644 --- a/mpd/base/xml/xml_node_unittest.cc +++ b/mpd/base/xml/xml_node_unittest.cc @@ -1,3 +1,9 @@ +// Copyright 2014 Google Inc. All rights reserved. +// +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file or at +// https://developers.google.com/open-source/licenses/bsd + #include "base/logging.h" #include "base/strings/string_util.h" #include "mpd/base/xml/xml_node.h" diff --git a/mpd/mpd.gyp b/mpd/mpd.gyp index a41c7e0f06..f90ce22704 100644 --- a/mpd/mpd.gyp +++ b/mpd/mpd.gyp @@ -1,3 +1,9 @@ +# Copyright 2014 Google Inc. All rights reserved. +# +# Use of this source code is governed by a BSD-style +# license that can be found in the LICENSE file or at +# https://developers.google.com/open-source/licenses/bsd +# # GYP file for any MPD generation targets. { diff --git a/mpd/util/mpd_writer.cc b/mpd/util/mpd_writer.cc index 291d2678e9..5ac20e6197 100644 --- a/mpd/util/mpd_writer.cc +++ b/mpd/util/mpd_writer.cc @@ -1,3 +1,9 @@ +// Copyright 2014 Google Inc. All rights reserved. +// +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file or at +// https://developers.google.com/open-source/licenses/bsd + #include "mpd/util/mpd_writer.h" #include "base/basictypes.h" diff --git a/mpd/util/mpd_writer.h b/mpd/util/mpd_writer.h index b798c82fcf..20d18016bb 100644 --- a/mpd/util/mpd_writer.h +++ b/mpd/util/mpd_writer.h @@ -1,4 +1,11 @@ +// Copyright 2014 Google Inc. All rights reserved. +// +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file or at +// https://developers.google.com/open-source/licenses/bsd +// // Class for reading in MediaInfo from files and writing out an MPD. + #ifndef MPD_UTIL_MPD_WRITER_H_ #define MPD_UTIL_MPD_WRITER_H_ diff --git a/mpd/util/mpd_writer_unittest.cc b/mpd/util/mpd_writer_unittest.cc index a93608214e..b0eb07a0f1 100644 --- a/mpd/util/mpd_writer_unittest.cc +++ b/mpd/util/mpd_writer_unittest.cc @@ -1,3 +1,9 @@ +// Copyright 2014 Google Inc. All rights reserved. +// +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file or at +// https://developers.google.com/open-source/licenses/bsd + #include "base/file_util.h" #include "base/path_service.h" #include "mpd/util/mpd_writer.h" diff --git a/packager.gyp b/packager.gyp index ed473cd684..ea1f887d66 100644 --- a/packager.gyp +++ b/packager.gyp @@ -1,6 +1,9 @@ -# Copyright (c) 2013 Google Inc. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. +# Copyright 2014 Google Inc. All rights reserved. +# +# Use of this source code is governed by a BSD-style +# license that can be found in the LICENSE file or at +# https://developers.google.com/open-source/licenses/bsd + { 'target_defaults': { 'include_dirs': [