diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2015-10-07 03:11:43 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2015-10-07 03:11:43 -0700 |
| commit | b6009cf3f7c29b67b1f84f980ca6d67dd9814cb6 (patch) | |
| tree | 7691c1248ffbf858bf2f6634b0cfaefdd617ce19 | |
| parent | 11f68a8ac61346f9bcdf17de6bc9f8bb4e21012a (diff) | |
| parent | af34a82bb83548fa28a0be03144d50646fa65c75 (diff) | |
| download | android_hardware_qcom_media-b6009cf3f7c29b67b1f84f980ca6d67dd9814cb6.tar.gz android_hardware_qcom_media-b6009cf3f7c29b67b1f84f980ca6d67dd9814cb6.tar.bz2 android_hardware_qcom_media-b6009cf3f7c29b67b1f84f980ca6d67dd9814cb6.zip | |
Merge "libstagefrighthw: Add header guard to QComOMXMetadata.h and fix file perms"
| -rw-r--r--[-rwxr-xr-x] | libstagefrighthw/Android.mk | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | libstagefrighthw/MODULE_LICENSE_APACHE2 | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | libstagefrighthw/NOTICE | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | libstagefrighthw/QComOMXMetadata.h | 8 | ||||
| -rw-r--r--[-rwxr-xr-x] | libstagefrighthw/QComOMXPlugin.cpp | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | libstagefrighthw/QComOMXPlugin.h | 0 |
6 files changed, 7 insertions, 1 deletions
diff --git a/libstagefrighthw/Android.mk b/libstagefrighthw/Android.mk index 007e8049..007e8049 100755..100644 --- a/libstagefrighthw/Android.mk +++ b/libstagefrighthw/Android.mk diff --git a/libstagefrighthw/MODULE_LICENSE_APACHE2 b/libstagefrighthw/MODULE_LICENSE_APACHE2 index e69de29b..e69de29b 100755..100644 --- a/libstagefrighthw/MODULE_LICENSE_APACHE2 +++ b/libstagefrighthw/MODULE_LICENSE_APACHE2 diff --git a/libstagefrighthw/NOTICE b/libstagefrighthw/NOTICE index a94ca1f6..a94ca1f6 100755..100644 --- a/libstagefrighthw/NOTICE +++ b/libstagefrighthw/NOTICE diff --git a/libstagefrighthw/QComOMXMetadata.h b/libstagefrighthw/QComOMXMetadata.h index 13168f5d..f03188ef 100755..100644 --- a/libstagefrighthw/QComOMXMetadata.h +++ b/libstagefrighthw/QComOMXMetadata.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2011 The Linux Foundation. All rights reserved. + * Copyright (C) 2011-2015 The Linux Foundation. All rights reserved. * Copyright (c) 2011 The Android Open Source Project * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -14,6 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + +#ifndef QCOM_OMX_METADATA_H_ +#define QCOM_OMX_METADATA_H_ + #include <system/window.h> #include <media/hardware/MetadataBufferType.h> @@ -33,3 +37,5 @@ namespace android { }; #endif } + +#endif diff --git a/libstagefrighthw/QComOMXPlugin.cpp b/libstagefrighthw/QComOMXPlugin.cpp index 9446dcf6..9446dcf6 100755..100644 --- a/libstagefrighthw/QComOMXPlugin.cpp +++ b/libstagefrighthw/QComOMXPlugin.cpp diff --git a/libstagefrighthw/QComOMXPlugin.h b/libstagefrighthw/QComOMXPlugin.h index fc623e3a..fc623e3a 100755..100644 --- a/libstagefrighthw/QComOMXPlugin.h +++ b/libstagefrighthw/QComOMXPlugin.h |