RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

Make sure clip coordinates are inside the screen area. 

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29425 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
eugeni 2009-07-18 11:33:03 +00:00
parent 380fc1a763
commit bad51c711f
2 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libass/ass_render.c
View File

@ -317,6 +317,11 @@ static ass_image_t* my_draw_bitmap(unsigned char* bitmap, int bitmap_w, int bitm
{
ass_image_t* img = calloc(1, sizeof(ass_image_t));
assert(dst_x >= 0);
assert(dst_y >= 0);
assert(dst_x + bitmap_w < frame_context.width);
assert(dst_y + bitmap_h < frame_context.height);
img->w = bitmap_w;
img->h = bitmap_h;
img->stride = stride;
@ -598,6 +603,7 @@ static double x2scr_pos(double x) {
return x*frame_context.orig_width / frame_context.track->PlayResX +
global_settings->left_margin;
}
/**
* \brief Mapping between script and screen coordinates
*/
@ -2148,6 +2154,11 @@ static int ass_render_event(ass_event_t* event, event_images_t* event_images)
render_context.clip_y1 = y2scr_pos(render_context.clip_y1);
}
render_context.clip_x0 = FFMIN(FFMAX(render_context.clip_x0, 0), frame_context.width);
render_context.clip_x1 = FFMIN(FFMAX(render_context.clip_x1, 0), frame_context.width);
render_context.clip_y0 = FFMIN(FFMAX(render_context.clip_y0, 0), frame_context.height);
render_context.clip_y1 = FFMIN(FFMAX(render_context.clip_y1, 0), frame_context.height);
// calculate rotation parameters
{
FT_Vector center;

4
libmpcodecs/vf_ass.c
View File

@ -219,6 +219,10 @@ static void copy_from_image(struct vf_instance_s* vf, int first_row, int last_ro
last_row += (last_row % 2);
chroma_rows = (last_row - first_row) / 2;
assert(first_row >= 0);
assert(first_row <= last_row);
assert(last_row < vf->priv->outh);
for (pl = 1; pl < 3; ++pl) {
int dst_stride = vf->priv->outw;
int src_stride = vf->dmpi->stride[pl];