Skip to content

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

Use the MKV track width and height when the one in extradata are null 

Fix #11387
parent ebcc69cf
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 2 deletions
modules/demux/mkv/matroska_segment_parse.cpp
View file @ e7eeb970
...@@ -1403,8 +1403,13 @@ int32_t matroska_segment_c::TrackInit( mkv_track_t * p_tk ) ...@@ -1403,8 +1403,13 @@ int32_t matroska_segment_c::TrackInit( mkv_track_t * p_tk )
MP4_ReadBox_sample_vide( p_mp4_stream, p_box ) ) MP4_ReadBox_sample_vide( p_mp4_stream, p_box ) )
{ {
p_tk->fmt.i_codec = p_box->i_type; p_tk->fmt.i_codec = p_box->i_type;
p_tk->fmt.video.i_width = p_box->data.p_sample_vide->i_width; uint32_t i_width = p_box->data.p_sample_vide->i_width;
p_tk->fmt.video.i_height = p_box->data.p_sample_vide->i_height; uint32_t i_height = p_box->data.p_sample_vide->i_height;
if( i_width && i_height )
{
p_tk->fmt.video.i_width = i_width;
p_tk->fmt.video.i_height = i_height;
}
p_tk->fmt.i_extra = p_box->data.p_sample_vide->i_qt_image_description; p_tk->fmt.i_extra = p_box->data.p_sample_vide->i_qt_image_description;
p_tk->fmt.p_extra = xmalloc( p_tk->fmt.i_extra ); p_tk->fmt.p_extra = xmalloc( p_tk->fmt.i_extra );
memcpy( p_tk->fmt.p_extra, p_box->data.p_sample_vide->p_qt_image_description, p_tk->fmt.i_extra ); memcpy( p_tk->fmt.p_extra, p_box->data.p_sample_vide->p_qt_image_description, p_tk->fmt.i_extra );
......
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