summaryrefslogtreecommitdiffstats
path: root/src/plugins/directshow/player/videosurfacefilter.h
diff options
context:
space:
mode:
authorChristian Strømme <christian.stromme@qt.io>2016-11-10 17:55:15 +0100
committerYoann Lopes <yoann.lopes@qt.io>2017-01-27 13:27:15 +0000
commit57a4cabd78aba3d6c1dd4802b0e3baf5ed3e4758 (patch)
treefc329fb425258fee98c727691c3310ec706beb29 /src/plugins/directshow/player/videosurfacefilter.h
parent47c672cdd67853658a2f86688ec72eb9b4d8c1ca (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/player/videosurfacefilter.h')
-rw-r--r--src/plugins/directshow/player/videosurfacefilter.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/directshow/player/videosurfacefilter.h b/src/plugins/directshow/player/videosurfacefilter.h
index 581e33c70..6d6cc7593 100644
--- a/src/plugins/directshow/player/videosurfacefilter.h
+++ b/src/plugins/directshow/player/videosurfacefilter.h
@@ -83,8 +83,8 @@ public:
STDMETHODIMP_(ULONG) GetMiscFlags();
// DirectShowPin (delegate)
- bool isMediaTypeSupported(const DirectShowMediaType *type);
- bool setMediaType(const DirectShowMediaType *type);
+ bool isMediaTypeSupported(const AM_MEDIA_TYPE *type);
+ bool setMediaType(const AM_MEDIA_TYPE *type);
HRESULT completeConnection(IPin *pin);
HRESULT connectionEnded();