Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c33a0dc6 authored by Marco Nelissen's avatar Marco Nelissen Committed by Android Git Automerger
Browse files

am 3d54bda8: am bd15f216: am feea7c3b: am af238382: Merge "Fix VideoFrame...

am 3d54bda8: am bd15f216: am feea7c3b: am af238382: Merge "Fix VideoFrame class layout for 64/32 bit" into lmp-dev

* commit '3d54bda8':
  Fix VideoFrame class layout for 64/32 bit
parents d7eb9ed5 3d54bda8
Loading
Loading
Loading
Loading
+4 −1
Original line number Diff line number Diff line
@@ -63,8 +63,11 @@ public:
    uint32_t mDisplayWidth;
    uint32_t mDisplayHeight;
    uint32_t mSize;            // Number of bytes in mData
    int32_t  mRotationAngle;   // rotation angle, clockwise, should be multiple of 90
    // mData should be 64 bit aligned to prevent additional padding
    uint8_t* mData;            // Actual binary data
    int32_t  mRotationAngle;   // rotation angle, clockwise
    // pad structure so it's the same size on 64 bit and 32 bit
    char     mPadding[8 - sizeof(mData)];
};

}; // namespace android