diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2013-11-01 11:13:59 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2013-11-01 11:13:59 -0700 |
| commit | a8904d7475bbc5ced9a3f9a46c9b8686fe9977aa (patch) | |
| tree | 0579a5bb690667ca963ab0288a483dc7c617adb3 /libstagefrighthw | |
| parent | 3c8abcf529e808fe5ff6fa98186b6ff6e27a1316 (diff) | |
| parent | 67c20afe1761e127efe276ff063448c61a1e666c (diff) | |
| download | media-a8904d7475bbc5ced9a3f9a46c9b8686fe9977aa.tar.gz | |
Merge "mm-video: resolve compilation issues with conflicting declarations"
Diffstat (limited to 'libstagefrighthw')
| -rwxr-xr-x | libstagefrighthw/QComOMXMetadata.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/libstagefrighthw/QComOMXMetadata.h b/libstagefrighthw/QComOMXMetadata.h index 6bb001e8..13168f5d 100755 --- a/libstagefrighthw/QComOMXMetadata.h +++ b/libstagefrighthw/QComOMXMetadata.h @@ -15,14 +15,10 @@ * limitations under the License. */ #include <system/window.h> +#include <media/hardware/MetadataBufferType.h> namespace android { - typedef enum { - kMetadataBufferTypeCameraSource = 0, - kMetadataBufferTypeGrallocSource = 1, - } MetadataBufferType; - typedef struct encoder_media_buffer_type { MetadataBufferType buffer_type; buffer_handle_t meta_handle; |