RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

xcbgrab: Validate the capture area 

And notify why the capture is impossible.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
This commit is contained in:
Luca Barbato 2015-03-14 12:30:11 +01:00
parent 82a10225f8
commit e8c4db0d4d
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libavdevice/xcbgrab.c
View File

@ -528,8 +528,17 @@ static int create_stream(AVFormatContext *s)
gc = xcb_get_geometry(c->conn, c->screen->root); gc = xcb_get_geometry(c->conn, c->screen->root);
geo = xcb_get_geometry_reply(c->conn, gc, NULL); geo = xcb_get_geometry_reply(c->conn, gc, NULL);
c->width = FFMIN(geo->width, c->width); if (c->x + c->width >= geo->width ||
c->height = FFMIN(geo->height, c->height); c->y + c->height >= geo->height) {
av_log(s, AV_LOG_ERROR,
"Capture area %dx%d at position %d.%d "
"outside the screen size %dx%d\n",
c->width, c->height,
c->x, c->y,
geo->width, geo->height);
return AVERROR(EINVAL);
}
c->time_base = (AVRational){ st->avg_frame_rate.den, c->time_base = (AVRational){ st->avg_frame_rate.den,
st->avg_frame_rate.num }; st->avg_frame_rate.num };
c->time_frame = av_gettime(); c->time_frame = av_gettime();