diff options
| author | Eino-Ville Talvala <etalvala@google.com> | 2013-03-06 21:28:52 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-03-06 21:28:52 +0000 |
| commit | 3ba9dcb180ac8e01c513b1790cd0cad0f46b887f (patch) | |
| tree | 5c6665b540162488a3379563d185ee0abef641e0 /include/hardware/camera3.h | |
| parent | ca8581433b778c60b074839baa6c3f2233c09614 (diff) | |
| parent | 3a6e6b44324a7248123c4839b9a1dbffe8bd3439 (diff) | |
| download | hardware_libhardware-3ba9dcb180ac8e01c513b1790cd0cad0f46b887f.zip hardware_libhardware-3ba9dcb180ac8e01c513b1790cd0cad0f46b887f.tar.gz hardware_libhardware-3ba9dcb180ac8e01c513b1790cd0cad0f46b887f.tar.bz2 | |
Merge "Camera: Fix incorrect pointer types" into jb-mr2-dev
Diffstat (limited to 'include/hardware/camera3.h')
| -rw-r--r-- | include/hardware/camera3.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/hardware/camera3.h b/include/hardware/camera3.h index 94a8e39..be0154f 100644 --- a/include/hardware/camera3.h +++ b/include/hardware/camera3.h @@ -508,8 +508,8 @@ typedef struct camera3_stream_configuration { uint32_t num_streams; /** - * An array of camera streams, defining the input/output configuration for - * the camera HAL device. + * An array of camera stream pointers, defining the input/output + * configuration for the camera HAL device. * * At most one input-capable stream may be defined (INPUT or BIDIRECTIONAL) * in a single configuration. @@ -517,7 +517,7 @@ typedef struct camera3_stream_configuration { * At least one output-capable stream must be defined (OUTPUT or * BIDIRECTIONAL). */ - camera3_stream_t *streams; + camera3_stream_t **streams; } camera3_stream_configuration_t; @@ -589,7 +589,7 @@ typedef struct camera3_stream_buffer_set { * should inspect the passed-in buffers to determine any platform-private * pixel format information. */ - buffer_handle_t *buffers; + buffer_handle_t **buffers; } camera3_stream_buffer_set_t; |