diff options
| author | Christian Strømme <christian.stromme@qt.io> | 2017-04-20 17:23:11 +0200 |
|---|---|---|
| committer | Christian Stromme <christian.stromme@qt.io> | 2017-04-27 13:25:13 +0000 |
| commit | f7e5f12149b73b60c594be626eeac8c2aa34beda (patch) | |
| tree | fc4a816cf434ed4c944ad91cebac76b71428311c /src/plugins/android/src/common/qandroidvideooutput.h | |
| parent | 9dbdd5db797fccb8932f49d7380fb5f5eda12cf2 (diff) | |
Android: Fix crash caused by stale video-frame objects
Make sure that the frame being processed is still valid, that is, the
size is valid and correct, and that the frame buffer is accessible.
Task-number: QTBUG-60115
Change-Id: Ic64b6f7d45d92b7923d97d6ecdc630da31abee17
Reviewed-by: Michael Dippold <mike@dippold.com>
Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
Diffstat (limited to 'src/plugins/android/src/common/qandroidvideooutput.h')
| -rw-r--r-- | src/plugins/android/src/common/qandroidvideooutput.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/android/src/common/qandroidvideooutput.h b/src/plugins/android/src/common/qandroidvideooutput.h index a12db75a2..936e4c40b 100644 --- a/src/plugins/android/src/common/qandroidvideooutput.h +++ b/src/plugins/android/src/common/qandroidvideooutput.h @@ -112,7 +112,7 @@ private Q_SLOTS: private: bool initSurfaceTexture(); - void renderFrameToFbo(); + bool renderFrameToFbo(); void createGLResources(); QMutex m_mutex; |