diff options
| author | James Dong <jdong@google.com> | 2011-07-12 14:43:34 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-07-12 14:43:34 -0700 |
| commit | 8deb152167af1dbf39d532737f105368ee8973f5 (patch) | |
| tree | 41cc89735821eb5870b594e94b7122f162892749 | |
| parent | 63b96e48deb0a4c5b594693922bd9101ffc3ef93 (diff) | |
| parent | 5a5f9d636ed6c116993c6cad5abdad7a734992e8 (diff) | |
| download | frameworks_av-8deb152167af1dbf39d532737f105368ee8973f5.zip frameworks_av-8deb152167af1dbf39d532737f105368ee8973f5.tar.gz frameworks_av-8deb152167af1dbf39d532737f105368ee8973f5.tar.bz2 | |
Merge "Make MetadataBufferType.h C-friendly"
| -rw-r--r-- | include/media/stagefright/MetadataBufferType.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/include/media/stagefright/MetadataBufferType.h b/include/media/stagefright/MetadataBufferType.h index 275c19f..52a3257 100644 --- a/include/media/stagefright/MetadataBufferType.h +++ b/include/media/stagefright/MetadataBufferType.h @@ -17,7 +17,11 @@ #ifndef METADATA_BUFFER_TYPE_H #define METADATA_BUFFER_TYPE_H +#ifdef __cplusplus +extern "C" { namespace android { +#endif + /* * MetadataBufferType defines the type of the metadata buffers that * can be passed to video encoder component for encoding, via Stagefright @@ -72,6 +76,9 @@ typedef enum { } MetadataBufferType; +#ifdef __cplusplus } // namespace android +} +#endif #endif // METADATA_BUFFER_TYPE_H |