Skip to content

V
vlc-2-2
Commit 82d842bf authored by Ilkka Ollakka's avatar Ilkka Ollakka
Browse files
Options

canvas: handle sar{0,1} and assume it to be 1:1

parent c664aa35
Show whitespace changes
Inline Side-by-side
Showing with 7 additions and 1 deletion
modules/video_filter/canvas.c
View file @ 82d842bf
...@@ -180,11 +180,17 @@ static int Activate( vlc_object_t *p_this ) ...@@ -180,11 +180,17 @@ static int Activate( vlc_object_t *p_this )
return VLC_EGENERIC; return VLC_EGENERIC;
} }
if( p_filter->fmt_in.video.i_sar_num )
i_fmt_in_aspect = (int64_t)p_filter->fmt_in.video.i_sar_num * i_fmt_in_aspect = (int64_t)p_filter->fmt_in.video.i_sar_num *
p_filter->fmt_in.video.i_width * p_filter->fmt_in.video.i_width *
VOUT_ASPECT_FACTOR / VOUT_ASPECT_FACTOR /
p_filter->fmt_in.video.i_sar_den / p_filter->fmt_in.video.i_sar_den /
p_filter->fmt_in.video.i_height; p_filter->fmt_in.video.i_height;
else
i_fmt_in_aspect = (int64_t)p_filter->fmt_in.video.i_width *
VOUT_ASPECT_FACTOR /
p_filter->fmt_in.video.i_height;
psz_aspect = var_CreateGetNonEmptyString( p_filter, CFG_PREFIX "aspect" ); psz_aspect = var_CreateGetNonEmptyString( p_filter, CFG_PREFIX "aspect" );
if( psz_aspect ) if( psz_aspect )
{ {
......
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