Skip to content

V
vlc-2-2
Commit af8c1f65 authored by Denis Charmet's avatar Denis Charmet
Browse files
Options

Handle case where dwFormat is WAVE_FORMAT_EXTENSIBLE

parent b5cf1c1e
Show whitespace changes
Inline Side-by-side
Showing with 9 additions and 2 deletions
modules/demux/mkv/matroska_segment_parse.cpp
View file @ af8c1f65
...@@ -1305,7 +1305,14 @@ int32_t matroska_segment_c::TrackInit( mkv_track_t * p_tk ) ...@@ -1305,7 +1305,14 @@ int32_t matroska_segment_c::TrackInit( mkv_track_t * p_tk )
else else
{ {
WAVEFORMATEX *p_wf = (WAVEFORMATEX*)p_tk->p_extra_data; WAVEFORMATEX *p_wf = (WAVEFORMATEX*)p_tk->p_extra_data;
if( p_wf->wFormatTag == WAVE_FORMAT_EXTENSIBLE &&
p_tk->i_extra_data >= sizeof(WAVEFORMATEXTENSIBLE) )
{
WAVEFORMATEXTENSIBLE * p_wext = (WAVEFORMATEXTENSIBLE*) p_wf;
sf_tag_to_fourcc( &p_wext->SubFormat, &p_tk->fmt.i_codec, NULL);
/* FIXME should we use Samples and dwChannelMask?*/
}
else
wf_tag_to_fourcc( GetWLE( &p_wf->wFormatTag ), &p_tk->fmt.i_codec, NULL ); wf_tag_to_fourcc( GetWLE( &p_wf->wFormatTag ), &p_tk->fmt.i_codec, NULL );
if( p_tk->fmt.i_codec == VLC_FOURCC( 'u', 'n', 'd', 'f' ) ) if( p_tk->fmt.i_codec == VLC_FOURCC( 'u', 'n', 'd', 'f' ) )
......
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