ffmpeg | branch: release/2.6 | Nicolas George <geo...@nsup.org> | Wed May 6 11:53:19 2015 +0200| [1f7343c8145f76a482d5009e9b0739b4fcd1b891] | committer: Carl Eugen Hoyos
lavd/xcbgrab: fix comparison with screen size. Signed-off-by: Nicolas George <geo...@nsup.org> Signed-off-by: Michael Niedermayer <michae...@gmx.at> (cherry picked from commit 7971fa9ce0ead8d2e8a79dbe422e91dcef8222ba) > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1f7343c8145f76a482d5009e9b0739b4fcd1b891 --- libavdevice/xcbgrab.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavdevice/xcbgrab.c b/libavdevice/xcbgrab.c index ab3a11e..fc20ca6 100644 --- a/libavdevice/xcbgrab.c +++ b/libavdevice/xcbgrab.c @@ -532,8 +532,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 ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
