Skip to content

V
vlc
Commit eb928d42 authored by Laurent Aimar's avatar Laurent Aimar Committed by Jean-Baptiste Kempf
Browse files
Options

Fixed a potential crash due to a mix up between pitch and pixel pitch in blend.c.

parent 695e158c
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
modules/video_filter/blend.c
View file @ eb928d42
...@@ -1359,7 +1359,7 @@ static void BlendRGBAI420( filter_t *p_filter, picture_t *p_dst, ...@@ -1359,7 +1359,7 @@ static void BlendRGBAI420( filter_t *p_filter, picture_t *p_dst,
i_src_pix_pitch = p_src->p->i_pixel_pitch; i_src_pix_pitch = p_src->p->i_pixel_pitch;
i_src2_pitch = p_src->p->i_pitch; i_src2_pitch = p_src->p->i_pitch;
p_src2 = p_src->p->p_pixels + p_src2 = p_src->p->p_pixels +
p_filter->fmt_in.video.i_x_offset * i_src2_pitch + p_filter->fmt_in.video.i_x_offset * i_src_pix_pitch +
p_src->p->i_pitch * p_filter->fmt_in.video.i_y_offset; p_src->p->i_pitch * p_filter->fmt_in.video.i_y_offset;
...@@ -1424,7 +1424,7 @@ static void BlendRGBAR24( filter_t *p_filter, picture_t *p_dst_pic, ...@@ -1424,7 +1424,7 @@ static void BlendRGBAR24( filter_t *p_filter, picture_t *p_dst_pic,
i_src_pix_pitch = p_src->p->i_pixel_pitch; i_src_pix_pitch = p_src->p->i_pixel_pitch;
i_src2_pitch = p_src->p->i_pitch; i_src2_pitch = p_src->p->i_pitch;
p_src2 = p_src->p->p_pixels + p_src2 = p_src->p->p_pixels +
p_filter->fmt_in.video.i_x_offset * i_pix_pitch + p_filter->fmt_in.video.i_x_offset * i_src_pix_pitch +
p_src->p->i_pitch * p_filter->fmt_in.video.i_y_offset; p_src->p->i_pitch * p_filter->fmt_in.video.i_y_offset;
vlc_rgb_index( &i_rindex, &i_gindex, &i_bindex, &p_filter->fmt_out.video ); vlc_rgb_index( &i_rindex, &i_gindex, &i_bindex, &p_filter->fmt_out.video );
...@@ -1477,7 +1477,7 @@ static void BlendRGBAR16( filter_t *p_filter, picture_t *p_dst_pic, ...@@ -1477,7 +1477,7 @@ static void BlendRGBAR16( filter_t *p_filter, picture_t *p_dst_pic,
i_src_pix_pitch = p_src->p->i_pixel_pitch; i_src_pix_pitch = p_src->p->i_pixel_pitch;
i_src2_pitch = p_src->p->i_pitch; i_src2_pitch = p_src->p->i_pitch;
p_src2 = p_src->p->p_pixels + p_src2 = p_src->p->p_pixels +
p_filter->fmt_in.video.i_x_offset * i_pix_pitch + p_filter->fmt_in.video.i_x_offset * i_src_pix_pitch +
p_src->p->i_pitch * p_filter->fmt_in.video.i_y_offset; p_src->p->i_pitch * p_filter->fmt_in.video.i_y_offset;
/* Draw until we reach the bottom of the subtitle */ /* Draw until we reach the bottom of the subtitle */
......
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