zontreck/wine
1
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine.git synced 2024-11-19 17:06:04 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'wmreader' into 'master'

Browse source 
winegstreamer/wm_reader: Use codec format only for compressed types.

See merge request wine/wine!6447
This commit is contained in:
Ziqing Hui 2024-11-19 08:26:38 +00:00
commit 63aa55e300
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
dlls/winegstreamer/wm_reader.c
View file

@ -554,7 +554,9 @@ static HRESULT WINAPI stream_props_GetMediaType(IWMMediaProps *iface, WM_MEDIA_T
TRACE("iface %p, mt %p, size %p.\n", iface, mt, size);
wg_parser_stream_get_codec_format(config->stream->wg_stream, &codec_format);
format = (codec_format.major_type != WG_MAJOR_TYPE_UNKNOWN) ? &codec_format : &config->stream->format;
format = (codec_format.major_type != WG_MAJOR_TYPE_UNKNOWN
&& codec_format.major_type != WG_MAJOR_TYPE_AUDIO
&& codec_format.major_type != WG_MAJOR_TYPE_VIDEO) ? &codec_format : &config->stream->format;
if (!amt_from_wg_format(&stream_mt, format, true))
return E_OUTOFMEMORY;