virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

avdevice/xcbgrab: Fix offset support

Browse Source 
Found-by: carl
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-10-30 12:48:05 +01:00
parent 0c9f0da0f7
commit db442c8736
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
libavdevice/xcbgrab.c
View File

@ -491,7 +491,6 @@ static int create_stream(AVFormatContext *s)
{ {
XCBGrabContext *c = s->priv_data; XCBGrabContext *c = s->priv_data;
AVStream *st = avformat_new_stream(s, NULL); AVStream *st = avformat_new_stream(s, NULL);
const char *opts = strchr(s->filename, '+');
xcb_get_geometry_cookie_t gc; xcb_get_geometry_cookie_t gc;
xcb_get_geometry_reply_t *geo; xcb_get_geometry_reply_t *geo;
int ret; int ret;
@ -507,9 +506,6 @@ static int create_stream(AVFormatContext *s)
if (ret < 0) if (ret < 0)
return ret; return ret;
if (opts)
sscanf(opts, "%d,%d", &c->x, &c->y);
avpriv_set_pts_info(st, 64, 1, 1000000); avpriv_set_pts_info(st, 64, 1, 1000000);
gc = xcb_get_geometry(c->conn, c->screen->root); gc = xcb_get_geometry(c->conn, c->screen->root);
@ -598,8 +594,20 @@ static av_cold int xcbgrab_read_header(AVFormatContext *s)
XCBGrabContext *c = s->priv_data; XCBGrabContext *c = s->priv_data;
int screen_num, ret; int screen_num, ret;
const xcb_setup_t *setup; const xcb_setup_t *setup;
char *display_name = av_strdup(s->filename);
c->conn = xcb_connect(s->filename, &screen_num); if (s->filename) {
if (!display_name)
return AVERROR(ENOMEM);
if (!sscanf(s->filename, "%[^+]+%d,%d", display_name, &c->x, &c->y)) {
*display_name = 0;
sscanf(s->filename, "+%d,%d", &c->x, &c->y);
}
}
c->conn = xcb_connect(display_name, &screen_num);
av_freep(&display_name);
if ((ret = xcb_connection_has_error(c->conn))) { if ((ret = xcb_connection_has_error(c->conn))) {
av_log(s, AV_LOG_ERROR, "Cannot open display %s, error %d.\n", av_log(s, AV_LOG_ERROR, "Cannot open display %s, error %d.\n",
s->filename ? s->filename : "default", ret); s->filename ? s->filename : "default", ret);