Skip to content

V
vlc-2-2
Commit ec3567fd authored by Derk-Jan Hartman's avatar Derk-Jan Hartman
Browse files
Options

* Ehm, MAX, not MIN of course. And let's check both before and after cropping.

parent 3da30fcd
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 2 deletions
src/video_output/vout_subpictures.c
View file @ ec3567fd
...@@ -731,6 +731,9 @@ void spu_RenderSubpictures( spu_t *p_spu, video_format_t *p_fmt, ...@@ -731,6 +731,9 @@ void spu_RenderSubpictures( spu_t *p_spu, video_format_t *p_fmt,
p_subpic->i_y * i_scale_height / 1000; p_subpic->i_y * i_scale_height / 1000;
} }
i_x_offset = __MAX( i_x_offset, 0 );
i_y_offset = __MAX( i_y_offset, 0 );
if( p_spu->i_margin != 0 && p_spu->b_force_crop == VLC_FALSE ) if( p_spu->i_margin != 0 && p_spu->b_force_crop == VLC_FALSE )
{ {
...@@ -804,8 +807,8 @@ void spu_RenderSubpictures( spu_t *p_spu, video_format_t *p_fmt, ...@@ -804,8 +807,8 @@ void spu_RenderSubpictures( spu_t *p_spu, video_format_t *p_fmt,
} }
} }
i_x_offset = __MIN( i_x_offset, 0 ); i_x_offset = __MAX( i_x_offset, 0 );
i_y_offset = __MIN( i_y_offset, 0 ); i_y_offset = __MAX( i_y_offset, 0 );
p_spu->p_blend->pf_video_blend( p_spu->p_blend, p_pic_dst, p_spu->p_blend->pf_video_blend( p_spu->p_blend, p_pic_dst,
p_pic_src, &p_region->picture, i_x_offset, i_y_offset, p_pic_src, &p_region->picture, i_x_offset, i_y_offset,
......
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