diff options
| author | Matt A. Tobin <email@mattatobin.com> | 2019-05-29 16:01:50 -0400 |
|---|---|---|
| committer | Matt A. Tobin <email@mattatobin.com> | 2019-05-29 16:01:50 -0400 |
| commit | 363bfeb2c06e5f57136ebdab8da1ebeba0591520 (patch) | |
| tree | 3fbaf59efc6807c48a69fabe229be712c0d25af6 /media | |
| parent | d197e65f448d0dfbb5de7ff5d09a1aceaf7620f6 (diff) | |
| parent | 23115528859e518813214b35c36232da0c1c7b5f (diff) | |
| download | UXP-363bfeb2c06e5f57136ebdab8da1ebeba0591520.tar UXP-363bfeb2c06e5f57136ebdab8da1ebeba0591520.tar.gz UXP-363bfeb2c06e5f57136ebdab8da1ebeba0591520.tar.lz UXP-363bfeb2c06e5f57136ebdab8da1ebeba0591520.tar.xz UXP-363bfeb2c06e5f57136ebdab8da1ebeba0591520.zip | |
Merge branch 'master' of https://github.com/MoonchildProductions/UXP
Diffstat (limited to 'media')
| -rw-r--r-- | media/webrtc/trunk/webrtc/modules/video_capture/windows/MediaType.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/media/webrtc/trunk/webrtc/modules/video_capture/windows/MediaType.cpp b/media/webrtc/trunk/webrtc/modules/video_capture/windows/MediaType.cpp index 54fc2ab7b..f06709446 100644 --- a/media/webrtc/trunk/webrtc/modules/video_capture/windows/MediaType.cpp +++ b/media/webrtc/trunk/webrtc/modules/video_capture/windows/MediaType.cpp @@ -82,7 +82,10 @@ MediaType::Assign(const AM_MEDIA_TYPE* aMediaType) Clear(); // Shallow copy. - memcpy(this, aMediaType, sizeof(AM_MEDIA_TYPE)); + memcpy(static_cast<AM_MEDIA_TYPE*>(this), aMediaType, sizeof(AM_MEDIA_TYPE)); + + if (pUnk) + pUnk->AddRef(); // Create deep copy of incoming data... if (cbFormat) { @@ -92,9 +95,6 @@ MediaType::Assign(const AM_MEDIA_TYPE* aMediaType) memcpy(pbFormat, aMediaType->pbFormat, cbFormat); } - if (pUnk) - pUnk->AddRef(); - return S_OK; } |