slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Re-enabled CIImage based gfx video item on Mac

Browse Source 
Also prefer CoreImageHandle to GLTextureHandle
in QuickTime player backend, to avoid unnecessary
copy via FBO.

Change-Id: Id5aa039c438378b7bbf816b7845b05574683c471
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
This commit is contained in:
Dmytro Poplavskiy
2012-08-23 15:59:18 +10:00
committed by Qt by Nokia
parent 3613a14b38
commit 09a7fda971
5 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/multimediawidgets/qpaintervideosurface.cpp
View File

@@ -209,7 +209,7 @@ void QVideoSurfaceGenericPainter::updateColors(int, int, int, int)
#if !defined(QT_NO_OPENGL) && !defined(QT_OPENGL_ES_1_CL) && !defined(QT_OPENGL_ES_1)
#ifndef Q_WS_MAC
#ifndef Q_OS_MAC
# ifndef APIENTRYP
# ifdef APIENTRY
# define APIENTRYP APIENTRY *
@@ -1673,7 +1673,7 @@ void QPainterVideoSurface::createPainter()
{
Q_ASSERT(!m_painter);
#ifdef Q_WS_MAC
#ifdef Q_OS_MAC
if (m_glContext)
m_glContext->makeCurrent();