Maarten Lankhorst : strmbase: Allow NULL for time format in ConvertTimeFormat.
Alexandre Julliard
julliard at winehq.org
Fri Nov 5 13:47:18 CDT 2010
Module: wine
Branch: master
Commit: 4857772bf2c206112c318211ca677d9bf0faedb1
URL: http://source.winehq.org/git/wine.git/?a=commit;h=4857772bf2c206112c318211ca677d9bf0faedb1
Author: Maarten Lankhorst <m.b.lankhorst at gmail.com>
Date: Thu Nov 4 17:54:25 2010 +0100
strmbase: Allow NULL for time format in ConvertTimeFormat.
---
dlls/strmbase/seeking.c | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/dlls/strmbase/seeking.c b/dlls/strmbase/seeking.c
index 93fc6db..f03dde6 100644
--- a/dlls/strmbase/seeking.c
+++ b/dlls/strmbase/seeking.c
@@ -179,6 +179,11 @@ HRESULT WINAPI SourceSeekingImpl_GetCurrentPosition(IMediaSeeking * iface, LONGL
HRESULT WINAPI SourceSeekingImpl_ConvertTimeFormat(IMediaSeeking * iface, LONGLONG * pTarget, const GUID * pTargetFormat, LONGLONG Source, const GUID * pSourceFormat)
{
+ SourceSeeking *This = (SourceSeeking *)iface;
+ if (!pTargetFormat)
+ pTargetFormat = &This->timeformat;
+ if (!pSourceFormat)
+ pSourceFormat = &This->timeformat;
if (IsEqualIID(pTargetFormat, &TIME_FORMAT_MEDIA_TIME) && IsEqualIID(pSourceFormat, &TIME_FORMAT_MEDIA_TIME))
{
*pTarget = Source;
More information about the wine-cvs
mailing list