summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorYoann Lopes <yoann.lopes@digia.com>2013-05-21 16:09:33 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-05-22 12:56:07 +0200
commit5c087bb6153b951e1c5709ee7f998819d08a6122 (patch)
tree1924466ca9a01d3475630f972f8f661d97ec9969 /src
parent853fc503470c1daffcf0a6bf73bd915863b65da0 (diff)
Android: fixed crash when resetting the video surface.
Change-Id: I64a28cbcb8a48d13a9e1c98005da9f4cce821cb4 Reviewed-by: Christian Stromme <christian.stromme@digia.com>
Diffstat (limited to 'src')
-rw-r--r--src/plugins/android/mediaplayer/qandroidvideorendercontrol.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/plugins/android/mediaplayer/qandroidvideorendercontrol.cpp b/src/plugins/android/mediaplayer/qandroidvideorendercontrol.cpp
index 7b810fa41..c63e0e771 100644
--- a/src/plugins/android/mediaplayer/qandroidvideorendercontrol.cpp
+++ b/src/plugins/android/mediaplayer/qandroidvideorendercontrol.cpp
@@ -182,7 +182,8 @@ void QAndroidVideoRendererControl::setSurface(QAbstractVideoSurface *surface)
m_surface = surface;
- m_useImage = !m_surface->supportedPixelFormats(QAbstractVideoBuffer::GLTextureHandle).contains(QVideoFrame::Format_BGR32);
+ if (m_surface)
+ m_useImage = !m_surface->supportedPixelFormats(QAbstractVideoBuffer::GLTextureHandle).contains(QVideoFrame::Format_BGR32);
}
jobject QAndroidVideoRendererControl::surfaceHolder()