diff options
| author | Lajos Molnar <lajos@google.com> | 2015-02-07 03:03:05 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-02-07 03:03:05 +0000 |
| commit | 6d5a1afac2a7bca6b171261ca9b237c3a516e567 (patch) | |
| tree | fc0459609f2699beb7e3bae2ab798e1d3cbe086e /media/libstagefright/codecs/on2/h264dec/omxdl/arm_neon/api/omxtypes_s.h | |
| parent | 5421d5b23d2fcea6ba5573bf3490c65f97c2e730 (diff) | |
| parent | 6d5a063de358312e6d133f8937ffb1b795116129 (diff) | |
| download | frameworks_av-6d5a1afac2a7bca6b171261ca9b237c3a516e567.zip frameworks_av-6d5a1afac2a7bca6b171261ca9b237c3a516e567.tar.gz frameworks_av-6d5a1afac2a7bca6b171261ca9b237c3a516e567.tar.bz2 | |
am 6d5a063d: am 0c11001c: Merge "stagefright: change licensing headers on h264dec omxdl sources" into lmp-mr1-dev
* commit '6d5a063de358312e6d133f8937ffb1b795116129':
stagefright: change licensing headers on h264dec omxdl sources
Diffstat (limited to 'media/libstagefright/codecs/on2/h264dec/omxdl/arm_neon/api/omxtypes_s.h')
| -rw-r--r-- | media/libstagefright/codecs/on2/h264dec/omxdl/arm_neon/api/omxtypes_s.h | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/media/libstagefright/codecs/on2/h264dec/omxdl/arm_neon/api/omxtypes_s.h b/media/libstagefright/codecs/on2/h264dec/omxdl/arm_neon/api/omxtypes_s.h index 48703d1..6e742c7 100644 --- a/media/libstagefright/codecs/on2/h264dec/omxdl/arm_neon/api/omxtypes_s.h +++ b/media/libstagefright/codecs/on2/h264dec/omxdl/arm_neon/api/omxtypes_s.h @@ -1,11 +1,25 @@ ;// +;// Copyright (C) 2007-2008 ARM Limited +;// +;// Licensed under the Apache License, Version 2.0 (the "License"); +;// you may not use this file except in compliance with the License. +;// You may obtain a copy of the License at +;// +;// http://www.apache.org/licenses/LICENSE-2.0 +;// +;// Unless required by applicable law or agreed to in writing, software +;// distributed under the License is distributed on an "AS IS" BASIS, +;// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +;// See the License for the specific language governing permissions and +;// limitations under the License. +;// +;// ;// ;// File Name: omxtypes_s.h ;// OpenMAX DL: v1.0.2 ;// Revision: 12290 ;// Date: Wednesday, April 9, 2008 ;// -;// (c) Copyright 2007-2008 ARM Limited. All Rights Reserved. ;// ;// ;// |