diff options
author | James Dong <jdong@google.com> | 2011-03-17 11:56:05 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2011-03-17 11:56:05 -0700 |
commit | 9c0c5b5638fd2810b68e033963026cc1830b9ade (patch) | |
tree | b8e41efbfa47a5bd8d75aa02ca15e6695112aa5b /media | |
parent | 9940c8b6c8ab1711c9ee77cb9288888879b0b310 (diff) | |
parent | 2f1f2248c8439adbd686810e306c55f9e6a5abc3 (diff) | |
download | frameworks_base-9c0c5b5638fd2810b68e033963026cc1830b9ade.zip frameworks_base-9c0c5b5638fd2810b68e033963026cc1830b9ade.tar.gz frameworks_base-9c0c5b5638fd2810b68e033963026cc1830b9ade.tar.bz2 |
am 2f1f2248: Fix missing AOSP copyright headers for a bunch of media framework files
* commit '2f1f2248c8439adbd686810e306c55f9e6a5abc3':
Fix missing AOSP copyright headers for a bunch of media framework files
Diffstat (limited to 'media')
-rw-r--r-- | media/libmedia/IOMX.cpp | 16 | ||||
-rw-r--r-- | media/libmediaplayerservice/StagefrightPlayer.cpp | 16 | ||||
-rw-r--r-- | media/libstagefright/ACodec.cpp | 16 | ||||
-rw-r--r-- | media/libstagefright/codecs/avc/common/include/avc_types.h | 15 | ||||
-rw-r--r-- | media/libstagefright/foundation/AHierarchicalStateMachine.cpp | 16 | ||||
-rw-r--r-- | media/libstagefright/include/MPEG2TSExtractor.h | 16 |
6 files changed, 95 insertions, 0 deletions
diff --git a/media/libmedia/IOMX.cpp b/media/libmedia/IOMX.cpp index d6a1757..d3aab08 100644 --- a/media/libmedia/IOMX.cpp +++ b/media/libmedia/IOMX.cpp @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2009 The Android Open Source Project + * + * 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. + */ + //#define LOG_NDEBUG 0 #define LOG_TAG "IOMX" #include <utils/Log.h> diff --git a/media/libmediaplayerservice/StagefrightPlayer.cpp b/media/libmediaplayerservice/StagefrightPlayer.cpp index e277121..c5cbd23 100644 --- a/media/libmediaplayerservice/StagefrightPlayer.cpp +++ b/media/libmediaplayerservice/StagefrightPlayer.cpp @@ -1,3 +1,19 @@ +/* + * Copyright (C) 2009 The Android Open Source Project + * + * 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. + */ + //#define LOG_NDEBUG 0 #define LOG_TAG "StagefrightPlayer" #include <utils/Log.h> diff --git a/media/libstagefright/ACodec.cpp b/media/libstagefright/ACodec.cpp index d590ab9..346d0bb 100644 --- a/media/libstagefright/ACodec.cpp +++ b/media/libstagefright/ACodec.cpp @@ -1,3 +1,19 @@ +/* + * Copyright (C) 2010 The Android Open Source Project + * + * 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. + */ + //#define LOG_NDEBUG 0 #define LOG_TAG "ACodec" diff --git a/media/libstagefright/codecs/avc/common/include/avc_types.h b/media/libstagefright/codecs/avc/common/include/avc_types.h index 73cad89..ec8b6de 100644 --- a/media/libstagefright/codecs/avc/common/include/avc_types.h +++ b/media/libstagefright/codecs/avc/common/include/avc_types.h @@ -1,3 +1,18 @@ +/* + * Copyright (C) 2009 The Android Open Source Project + * + * 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. + */ #ifndef AVC_TYPES_H_ #define AVC_TYPES_H_ diff --git a/media/libstagefright/foundation/AHierarchicalStateMachine.cpp b/media/libstagefright/foundation/AHierarchicalStateMachine.cpp index 30286d8..3b3f786 100644 --- a/media/libstagefright/foundation/AHierarchicalStateMachine.cpp +++ b/media/libstagefright/foundation/AHierarchicalStateMachine.cpp @@ -1,3 +1,19 @@ +/* + * Copyright (C) 2010 The Android Open Source Project + * + * 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. + */ + #include <media/stagefright/foundation/AHierarchicalStateMachine.h> #include <media/stagefright/foundation/ADebug.h> diff --git a/media/libstagefright/include/MPEG2TSExtractor.h b/media/libstagefright/include/MPEG2TSExtractor.h index efe7496..fe74a42 100644 --- a/media/libstagefright/include/MPEG2TSExtractor.h +++ b/media/libstagefright/include/MPEG2TSExtractor.h @@ -1,3 +1,19 @@ +/* + * Copyright (C) 2010 The Android Open Source Project + * + * 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. + */ + #ifndef MPEG2_TS_EXTRACTOR_H_ #define MPEG2_TS_EXTRACTOR_H_ |