diff options
| author | Christian Strømme <christian.stromme@qt.io> | 2017-09-26 15:43:23 +0200 |
|---|---|---|
| committer | Christian Strømme <christian.stromme@qt.io> | 2017-09-26 15:43:23 +0200 |
| commit | 2972eaa1330f377a7c3b1f583a643dbfbfc9531e (patch) | |
| tree | b3407be7bba8c50df76a550c5c2867061c6dea95 /src/gsttools | |
| parent | 230f070c7ed353605260f9fa79d0a5bc5181321c (diff) | |
| parent | 51b361faa703e157feaa0cfd79e7d473cb704811 (diff) | |
| download | qtmultimedia-2972eaa1330f377a7c3b1f583a643dbfbfc9531e.tar.gz | |
Merge remote-tracking branch 'origin/5.9' into 5.10
Change-Id: Ib7c41a4cd7fd6976ebab52673898888dfac53db5
Diffstat (limited to 'src/gsttools')
| -rw-r--r-- | src/gsttools/qgstvideorenderersink.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/gsttools/qgstvideorenderersink.cpp b/src/gsttools/qgstvideorenderersink.cpp index f66095a7d..4c73c26a3 100644 --- a/src/gsttools/qgstvideorenderersink.cpp +++ b/src/gsttools/qgstvideorenderersink.cpp @@ -247,13 +247,11 @@ GstFlowReturn QVideoSurfaceGstDelegate::render(GstBuffer *buffer) m_renderReturn = GST_FLOW_OK; m_renderBuffer = buffer; - GstFlowReturn flowReturn = waitForAsyncEvent(&locker, &m_renderCondition, 300) - ? m_renderReturn - : GST_FLOW_ERROR; + waitForAsyncEvent(&locker, &m_renderCondition, 300); m_renderBuffer = 0; - return flowReturn; + return m_renderReturn; } bool QVideoSurfaceGstDelegate::event(QEvent *event) |