diff options
Diffstat (limited to 'media')
| -rw-r--r-- | media/libpng/png.c | 3 | ||||
| -rw-r--r-- | media/webrtc/trunk/webrtc/modules/video_capture/windows/MediaType.cpp | 8 |
2 files changed, 5 insertions, 6 deletions
diff --git a/media/libpng/png.c b/media/libpng/png.c index e6fe51722..3630b1f73 100644 --- a/media/libpng/png.c +++ b/media/libpng/png.c @@ -4517,8 +4517,7 @@ png_image_free(png_imagep image) if (image != NULL && image->opaque != NULL && image->opaque->error_buf == NULL) { - /* Ignore errors here: */ - (void)png_safe_execute(image, png_image_free_function, image); + png_image_free_function(image); image->opaque = NULL; } } 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; } |