diff options
| author | noelallen@google.com <noelallen@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-18 00:41:22 +0000 |
|---|---|---|
| committer | noelallen@google.com <noelallen@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-18 00:41:22 +0000 |
| commit | 5f79c2adde064424d6b19f8673ef82e9cb92774d (patch) | |
| tree | ecf40509498dce2ed6b04ab1ff5ac3d694d307e1 /ppapi/c/dev/pp_video_dev.h | |
| parent | 30c918084bac874b6cfaabb93f0bb2545c5354e2 (diff) | |
| download | chromium_src-5f79c2adde064424d6b19f8673ef82e9cb92774d.zip chromium_src-5f79c2adde064424d6b19f8673ef82e9cb92774d.tar.gz chromium_src-5f79c2adde064424d6b19f8673ef82e9cb92774d.tar.bz2 | |
Integrate NaCl Head - Revert 69309 to restore 64b handles in PPAPI
BUG= http://code.google.com/p/nativeclient/issues/detail?id=933
TEST=It compiles can run the nacl ppapi srpc test
Review URL: http://codereview.chromium.org/6041001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@69602 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/c/dev/pp_video_dev.h')
| -rw-r--r-- | ppapi/c/dev/pp_video_dev.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/ppapi/c/dev/pp_video_dev.h b/ppapi/c/dev/pp_video_dev.h index 6f67c1e..adef7be 100644 --- a/ppapi/c/dev/pp_video_dev.h +++ b/ppapi/c/dev/pp_video_dev.h @@ -223,11 +223,6 @@ struct PP_VideoCompressedDataBuffer_Dev { // Bit mask of PP_VideoFrameInfoFlag. uint32_t flags; - // Padding to ensure the PP_Resource is 8-byte aligned relative to the - // start of the struct. This helps ensure PP_VideoFrameBuffer_Dev has - // consistent size and alignment across compilers. - int32_t padding; - // Time stamp of the frame in microsecond. uint64_t time_stamp_us; }; @@ -241,6 +236,11 @@ struct PP_VideoFrameBuffer_Dev { int32_t height; int32_t stride; + // Padding to ensure the PP_Resource is 8-byte aligned relative to the + // start of the struct. This helps ensure PP_VideoFrameBuffer_Dev has + // consistent size and alignment across compilers. + int32_t padding; + // TODO(wjia): uint8* would be better for some cases. PP_Resource buffer; } data_plane[PP_VIDEOFRAMEBUFFER_MAXNUMBERPLANES]; |