aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolas George <george@nsup.org>2015-05-06 11:53:19 +0200
committerMichael Niedermayer <michaelni@gmx.at>2015-05-21 20:43:39 +0200
commit1aaf9613a8741430a48c4470b14e3389d3cf46e6 (patch)
tree5bb5a457f029520d9638176bbae51bb998c6c091
parent8b95fc6d8dcc6509bd2b3067508c034b0b6effbd (diff)
downloadffmpeg-1aaf9613a8741430a48c4470b14e3389d3cf46e6.tar.gz
lavd/xcbgrab: fix comparison with screen size.
Signed-off-by: Nicolas George <george@nsup.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 7971fa9ce0ead8d2e8a79dbe422e91dcef8222ba) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavdevice/xcbgrab.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavdevice/xcbgrab.c b/libavdevice/xcbgrab.c
index 292597877b..1a06d33b41 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",