virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-02-14 22:22:59 +02:00
Code Issues Releases Activity

Merge commit '2c3f29c4894ee50635b846f202296ad79a7c0d33'

Browse Source 
* commit '2c3f29c4894ee50635b846f202296ad79a7c0d33':
  xcbgrab: Support empty filename string correctly

Conflicts:
	libavdevice/xcbgrab.c

See: 62eca2f827d441f52125191fd78c96b67a7ba30c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-12-10 12:20:23 +01:00
commit 81a045fe17
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavdevice/xcbgrab.c
View File

@ -613,11 +613,11 @@ static av_cold int xcbgrab_read_header(AVFormatContext *s)
sscanf(s->filename, "+%d,%d", &c->x, &c->y); sscanf(s->filename, "+%d,%d", &c->x, &c->y);
} }
c->conn = xcb_connect(display_name, &screen_num); c->conn = xcb_connect(display_name[0] ? display_name : NULL, &screen_num);
av_freep(&display_name); 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[0] ? s->filename : "default", ret);
return AVERROR(EIO); return AVERROR(EIO);
} }
setup = xcb_get_setup(c->conn); setup = xcb_get_setup(c->conn);