Ignore:
Timestamp:
May 5, 2011, 5:36:53 AM (14 years ago)
Author:
Dmitry A. Kuminov
Message:

trunk: Merged in qt 4.7.2 sources from branches/vendor/nokia/qt.

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk

  • trunk/src/multimedia/video/qabstractvideobuffer.cpp

    r769 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)
     
    7272    \value NoHandle The buffer has no handle, its data can only be accessed by mapping the buffer.
    7373    \value GLTextureHandle The handle of the buffer is an OpenGL texture ID.
     74    \value XvShmImageHandle The handle contains pointer to shared memory XVideo image.
     75    \value CoreImageHandle The handle contains pointer to Mac OS X CIImage.
     76    \value QPixmapHandle The handle of the buffer is a QPixmap.
    7477    \value UserHandle Start value for user defined handle types.
    7578
     
    8588    \value ReadOnly The mapped memory is populated with data from the video buffer when mapped, but
    8689    the content of the mapped memory may be discarded when unmapped.
    87     \value WriteOnly The mapped memory in unitialized when mapped, and the content will be used to
     90    \value WriteOnly The mapped memory is uninitialized when mapped, and the content will be used to
    8891    populate the video buffer when unmapped.
    8992    \value ReadWrite The mapped memory is populated with data from the video buffer, and the
Note: See TracChangeset for help on using the changeset viewer.