diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-03-21 14:26:15 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-03-21 14:26:22 +0100 |
| commit | e757890f4a5669b396039211902224f31666725a (patch) | |
| tree | bb220ff8b9d8d4a64ce5f197a4b39e3e5965da63 /src/plugins/directshow/player/directshowmediatype.cpp | |
| parent | caf0cbca71231dbb6403108ba41d2117d3ce6c6d (diff) | |
| parent | 71a6b1b62041981f894cb2b6589fce92f137bbc4 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: Ieb1a3081907093e31e8c8b7f95993bb3b2173672
Diffstat (limited to 'src/plugins/directshow/player/directshowmediatype.cpp')
| -rw-r--r-- | src/plugins/directshow/player/directshowmediatype.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/plugins/directshow/player/directshowmediatype.cpp b/src/plugins/directshow/player/directshowmediatype.cpp index cbe1753ae..984979c6e 100644 --- a/src/plugins/directshow/player/directshowmediatype.cpp +++ b/src/plugins/directshow/player/directshowmediatype.cpp @@ -198,9 +198,11 @@ QVideoSurfaceFormat::Direction DirectShowMediaType::scanLineDirection(QVideoFram case QVideoFrame::Format_BGR24: case QVideoFrame::Format_RGB565: case QVideoFrame::Format_RGB555: +#ifndef Q_OS_WINCE return bmiHeader.biHeight < 0 ? QVideoSurfaceFormat::TopToBottom : QVideoSurfaceFormat::BottomToTop; +#endif default: return QVideoSurfaceFormat::TopToBottom; } |