generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

xcbgrab: Unbreak parsing filename options

Browse Source 
CC: libav-stable@libav.org

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
This commit is contained in:
Luca Barbato 2015-02-22 20:36:09 +01:00
parent b31328d008
commit 85b3b1c4ba
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
libavdevice/xcbgrab.c
View File

@ -495,7 +495,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;
@ -511,9 +510,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);
@ -600,11 +596,23 @@ 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 *host = s->filename[0] ? s->filename : NULL;
const char *opts = strchr(s->filename, '+');
if (opts) {
sscanf(opts, "%d,%d", &c->x, &c->y);
host = av_strdup(s->filename);
host[opts - s->filename] = '\0';
}
c->conn = xcb_connect(host, &screen_num);
if (opts)
av_free(host);
c->conn = xcb_connect(s->filename[0] ? s->filename : NULL, &screen_num);
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[0] ? s->filename : "default", ret); s->filename[0] ? host : "default", ret);
return AVERROR(EIO); return AVERROR(EIO);
} }
setup = xcb_get_setup(c->conn); setup = xcb_get_setup(c->conn);