diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-09-17 22:55:04 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-09-17 22:55:04 +0200 |
| commit | 256ee311b936d69561e97f7f8ee832cff93cb509 (patch) | |
| tree | d02c2a997092b08fc461ef3e1471bb05ffb296df /src/plugins/directshow | |
| parent | 3ec70d3a2bda558d19396f1394294a3a0a4d7761 (diff) | |
| parent | e535480e13c2ba0483f4a25be90c5db82529c25c (diff) | |
| download | qtmultimedia-256ee311b936d69561e97f7f8ee832cff93cb509.tar.gz | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: I27d68b69f2ad15e930b6adab5b2ff583f4642fac
Diffstat (limited to 'src/plugins/directshow')
| -rw-r--r-- | src/plugins/directshow/camera/dscamerasession.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/plugins/directshow/camera/dscamerasession.cpp b/src/plugins/directshow/camera/dscamerasession.cpp index 64532d04b..bfd18a556 100644 --- a/src/plugins/directshow/camera/dscamerasession.cpp +++ b/src/plugins/directshow/camera/dscamerasession.cpp @@ -174,6 +174,8 @@ QVideoFrame::PixelFormat pixelFormatFromMediaSubtype(GUID uid) return QVideoFrame::Format_YUYV; else if (uid == MEDIASUBTYPE_NV12) return QVideoFrame::Format_NV12; + else if (uid == MEDIASUBTYPE_MJPG) + return QVideoFrame::Format_Jpeg; else if (uid == MEDIASUBTYPE_IMC1) return QVideoFrame::Format_IMC1; else if (uid == MEDIASUBTYPE_IMC2) |