ffmpeg | branch: release/2.5 | Nicolas George <[email protected]> | Wed May 6 11:53:19 2015 +0200| [1aaf9613a8741430a48c4470b14e3389d3cf46e6] | committer: Michael Niedermayer
lavd/xcbgrab: fix comparison with screen size. Signed-off-by: Nicolas George <[email protected]> Signed-off-by: Michael Niedermayer <[email protected]> (cherry picked from commit 7971fa9ce0ead8d2e8a79dbe422e91dcef8222ba) Signed-off-by: Michael Niedermayer <[email protected]> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1aaf9613a8741430a48c4470b14e3389d3cf46e6 --- libavdevice/xcbgrab.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavdevice/xcbgrab.c b/libavdevice/xcbgrab.c index 2925978..1a06d33 100644 --- a/libavdevice/xcbgrab.c +++ b/libavdevice/xcbgrab.c @@ -527,8 +527,8 @@ static int create_stream(AVFormatContext *s) gc = xcb_get_geometry(c->conn, c->screen->root); geo = xcb_get_geometry_reply(c->conn, gc, NULL); - if (c->x + c->width >= geo->width || - c->y + c->height >= geo->height) { + if (c->x + c->width > geo->width || + 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", _______________________________________________ ffmpeg-cvslog mailing list [email protected] http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
