Skip to content

V
vlc-2-2
Commit 11662eb8 authored by Francois Cartegnie's avatar Francois Cartegnie
Browse files
Options

demux: asf: only apply valid A/R 

refs #11063
parent fd569c88
Hide whitespace changes
Inline Side-by-side
Showing with 11 additions and 7 deletions
modules/demux/asf/asf.c
View file @ 11662eb8
...@@ -658,15 +658,19 @@ static void ParsePayloadExtensions(demux_t *p_demux, asf_track_t *tk, ...@@ -658,15 +658,19 @@ static void ParsePayloadExtensions(demux_t *p_demux, asf_track_t *tk,
uint8_t i_ratio_y = *(p_data + 1); uint8_t i_ratio_y = *(p_data + 1);
if ( tk->p_fmt->video.i_sar_num != i_ratio_x || tk->p_fmt->video.i_sar_den != i_ratio_y ) if ( tk->p_fmt->video.i_sar_num != i_ratio_x || tk->p_fmt->video.i_sar_den != i_ratio_y )
{ {
vout_thread_t *p_vout = input_GetVout( p_demux->p_input ); /* Only apply if origin pixel size >= 1x1, due to broken yacast */
if ( p_vout ) if ( tk->p_fmt->video.i_height * i_ratio_x > tk->p_fmt->video.i_width * i_ratio_y )
{ {
msg_Info( p_demux, "Changing aspect ratio to %i/%i", i_ratio_x, i_ratio_y ); vout_thread_t *p_vout = input_GetVout( p_demux->p_input );
tk->p_fmt->video.i_sar_num = i_ratio_x; if ( p_vout )
tk->p_fmt->video.i_sar_den = i_ratio_y; {
vout_ChangeAspectRatio( p_vout, i_ratio_x, i_ratio_y ); msg_Info( p_demux, "Changing aspect ratio to %i/%i", i_ratio_x, i_ratio_y );
vlc_object_release( p_vout ); vout_ChangeAspectRatio( p_vout, i_ratio_x, i_ratio_y );
vlc_object_release( p_vout );
}
} }
tk->p_fmt->video.i_sar_num = i_ratio_x;
tk->p_fmt->video.i_sar_den = i_ratio_y;
} }
} }
i_length -= i_payload_extensions_size; i_length -= i_payload_extensions_size;
......
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