diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-08-27 20:23:52 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-08-27 20:23:52 +0200 |
| commit | da7d462e315fb101fc9112a294b5ca2e3bd35a75 (patch) | |
| tree | 843917c14a566949318d1e8e03aa84a6ccc041d4 /src/multimedia/video | |
| parent | 820205e604a5f281238c23464638fdff72b969d1 (diff) | |
| parent | 6d95682d7ff282180655f2f384d8aba69c4f67af (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: I639d42e78a2b85e939c9f8e9dd5da70cdc058857
Diffstat (limited to 'src/multimedia/video')
| -rw-r--r-- | src/multimedia/video/qabstractvideobuffer.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/multimedia/video/qabstractvideobuffer.cpp b/src/multimedia/video/qabstractvideobuffer.cpp index 877fe3544..50e38a98c 100644 --- a/src/multimedia/video/qabstractvideobuffer.cpp +++ b/src/multimedia/video/qabstractvideobuffer.cpp @@ -98,7 +98,7 @@ int QAbstractVideoBufferPrivate::map( \value NoHandle The buffer has no handle, its data can only be accessed by mapping the buffer. \value GLTextureHandle The handle of the buffer is an OpenGL texture ID. \value XvShmImageHandle The handle contains pointer to shared memory XVideo image. - \value CoreImageHandle The handle contains pointer to OS X CIImage. + \value CoreImageHandle The handle contains pointer to \macos CIImage. \value QPixmapHandle The handle of the buffer is a QPixmap. \value EGLImageHandle The handle of the buffer is an EGLImageKHR. \value UserHandle Start value for user defined handle types. |