Commit 11594f56 authored by Nikolay Sivov's avatar Nikolay Sivov Committed by Alexandre Julliard

evr/mixer: Use regular media type interface for the output stream.

parent 7ab646ad
...@@ -47,8 +47,8 @@ struct input_stream ...@@ -47,8 +47,8 @@ struct input_stream
struct output_stream struct output_stream
{ {
IMFVideoMediaType *media_type; IMFMediaType *media_type;
IMFVideoMediaType **media_types; IMFMediaType **media_types;
unsigned int type_count; unsigned int type_count;
}; };
...@@ -175,11 +175,11 @@ static void video_mixer_clear_types(struct video_mixer *mixer) ...@@ -175,11 +175,11 @@ static void video_mixer_clear_types(struct video_mixer *mixer)
} }
for (i = 0; i < mixer->output.type_count; ++i) 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); heap_free(mixer->output.media_types);
if (mixer->output.media_type) if (mixer->output.media_type)
IMFVideoMediaType_Release(mixer->output.media_type); IMFMediaType_Release(mixer->output.media_type);
mixer->output.media_type = NULL; mixer->output.media_type = NULL;
} }
...@@ -662,7 +662,7 @@ static HRESULT video_mixer_collect_output_types(struct video_mixer *mixer, const ...@@ -662,7 +662,7 @@ static HRESULT video_mixer_collect_output_types(struct video_mixer *mixer, const
for (i = 0; i < count; ++i) for (i = 0; i < count; ++i)
{ {
subtype.Data1 = rt_formats[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; mixer->output.type_count = count;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment