diff options
| author | Johanna Aijala <johanna.aijala@digia.com> | 2013-02-21 09:30:40 +0200 |
|---|---|---|
| committer | Johanna Aijala <johanna.aijala@digia.com> | 2013-02-21 09:31:31 +0200 |
| commit | fb8d5f300ea30689674ce1b461b7f8d636a26332 (patch) | |
| tree | a7dcf294ecd847b9e5fd8eccd831a40defce5b43 /src/plugins/directshow/player/directshowmediatype.h | |
| parent | 1f2427642d2aa2e11318f7e5f968fb563f40d24b (diff) | |
| parent | 2db2cde0d8433ad1aed59412717c4cddf496ba66 (diff) | |
| download | qtmultimedia-fb8d5f300ea30689674ce1b461b7f8d636a26332.tar.gz | |
Merge branch 'stable' into release
Change-Id: I21911e86a651caa599110317a5e677cd61db4e86
Diffstat (limited to 'src/plugins/directshow/player/directshowmediatype.h')
| -rw-r--r-- | src/plugins/directshow/player/directshowmediatype.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/plugins/directshow/player/directshowmediatype.h b/src/plugins/directshow/player/directshowmediatype.h index 44e79c062..3808d1c74 100644 --- a/src/plugins/directshow/player/directshowmediatype.h +++ b/src/plugins/directshow/player/directshowmediatype.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt Toolkit. @@ -69,6 +69,9 @@ public: static QVideoSurfaceFormat formatFromType(const AM_MEDIA_TYPE &type); static int bytesPerLine(const QVideoSurfaceFormat &format); + +private: + static QVideoSurfaceFormat::Direction scanLineDirection(QVideoFrame::PixelFormat pixelFormat, const BITMAPINFOHEADER &bmiHeader); }; #endif |