Nikolay Sivov : evr/mixer: Use regular media type interface for the output stream.
Alexandre Julliard
julliard at winehq.org
Mon Oct 12 15:20:50 CDT 2020
Module: wine
Branch: master
Commit: 11594f563f13cd0fa7006d56250c16fe624a6129
URL: https://source.winehq.org/git/wine.git/?a=commit;h=11594f563f13cd0fa7006d56250c16fe624a6129
Author: Nikolay Sivov <nsivov at codeweavers.com>
Date: Mon Oct 12 14:17:27 2020 +0300
evr/mixer: Use regular media type interface for the output stream.
Signed-off-by: Nikolay Sivov <nsivov at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/evr/mixer.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/dlls/evr/mixer.c b/dlls/evr/mixer.c
index a18df5c4b3..bb76fd8894 100644
--- a/dlls/evr/mixer.c
+++ b/dlls/evr/mixer.c
@@ -47,8 +47,8 @@ struct input_stream
struct output_stream
{
- IMFVideoMediaType *media_type;
- IMFVideoMediaType **media_types;
+ IMFMediaType *media_type;
+ IMFMediaType **media_types;
unsigned int type_count;
};
@@ -175,11 +175,11 @@ static void video_mixer_clear_types(struct video_mixer *mixer)
}
for (i = 0; i < mixer->output.type_count; ++i)
{
- IMFVideoMediaType_Release(mixer->output.media_types[i]);
+ IMFMediaType_Release(mixer->output.media_types[i]);
}
heap_free(mixer->output.media_types);
if (mixer->output.media_type)
- IMFVideoMediaType_Release(mixer->output.media_type);
+ IMFMediaType_Release(mixer->output.media_type);
mixer->output.media_type = NULL;
}
@@ -662,7 +662,7 @@ static HRESULT video_mixer_collect_output_types(struct video_mixer *mixer, const
for (i = 0; i < count; ++i)
{
subtype.Data1 = rt_formats[i];
- MFCreateVideoMediaTypeFromSubtype(&subtype, &mixer->output.media_types[i]);
+ MFCreateVideoMediaTypeFromSubtype(&subtype, (IMFVideoMediaType **)&mixer->output.media_types[i]);
}
mixer->output.type_count = count;
}
More information about the wine-cvs
mailing list