diff options
| author | Christian Strømme <christian.stromme@qt.io> | 2016-11-10 17:55:15 +0100 |
|---|---|---|
| committer | Yoann Lopes <yoann.lopes@qt.io> | 2017-01-27 13:27:15 +0000 |
| commit | 57a4cabd78aba3d6c1dd4802b0e3baf5ed3e4758 (patch) | |
| tree | fc329fb425258fee98c727691c3310ec706beb29 /src/plugins/directshow/camera/directshowcameraglobal.h | |
| parent | 47c672cdd67853658a2f86688ec72eb9b4d8c1ca (diff) | |
DirectShow: Sanitize DirectShowMediaType
The DirectShowMediaType is now a thin data wrapper around AM_MEDIA_TYPE
and will for the most look and work the same way, with the exception
that it cleans up after itself. All utility functions are now static,
except clear() which, for convenience, is also provided as a non-static
member function.
In addition to the changes mentioned above, duplicated methods were
removed, conversion for ARGB32 was added, and an attempt to make
the usage of AM_MEDIA_TYPE and DirectShowMediaType was made more
consistent.
Change-Id: Iad32fb8eeabd9d4183e9bd10426cac3963e5d99a
Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
Diffstat (limited to 'src/plugins/directshow/camera/directshowcameraglobal.h')
| -rw-r--r-- | src/plugins/directshow/camera/directshowcameraglobal.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/plugins/directshow/camera/directshowcameraglobal.h b/src/plugins/directshow/camera/directshowcameraglobal.h index 75112a090..8df387b4a 100644 --- a/src/plugins/directshow/camera/directshowcameraglobal.h +++ b/src/plugins/directshow/camera/directshowcameraglobal.h @@ -44,9 +44,6 @@ #include <dshow.h> -DEFINE_GUID(MEDIASUBTYPE_I420, - 0x30323449,0x0000,0x0010,0x80,0x00,0x00,0xAA,0x00,0x38,0x9B,0x71); - extern const GUID MEDIASUBTYPE_RGB24; extern const GUID MEDIASUBTYPE_RGB32; extern const GUID MEDIASUBTYPE_YUY2; |