diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-09-19 14:29:40 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-09-19 14:29:47 +0200 |
| commit | 01c9322bfe918b886468eb520d77b21b6d8c0c11 (patch) | |
| tree | 23362a67d26b7b295a04e8cbacd64ee20393f990 /src/plugins/directshow/camera | |
| parent | 0f47f44d2fc7b3fac7fdd8ee6eeafd767c43ec2e (diff) | |
| parent | 256ee311b936d69561e97f7f8ee832cff93cb509 (diff) | |
| download | qtmultimedia-01c9322bfe918b886468eb520d77b21b6d8c0c11.tar.gz | |
Merge remote-tracking branch 'origin/5.7' into 5.8
Change-Id: I022c07dab3ded6072f7c103e299822caaf40cf34
Diffstat (limited to 'src/plugins/directshow/camera')
| -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 509057ba1..5587b479c 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) |