OSDN Git Service
(root)
/
android-x86
/
external-ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
fa8934d
)
xcbgrab: Support empty filename string correctly
author
Luca Barbato
<lu_zero@gentoo.org>
Wed, 26 Nov 2014 05:20:52 +0000
(06:20 +0100)
committer
Luca Barbato
<lu_zero@gentoo.org>
Wed, 10 Dec 2014 00:45:50 +0000
(
01:45
+0100)
Bug-Id: CID
1254664
CC: libav-stable@libav.org
libavdevice/xcbgrab.c
patch
|
blob
|
history
diff --git
a/libavdevice/xcbgrab.c
b/libavdevice/xcbgrab.c
index
5055fde
..
243ece4
100644
(file)
--- a/
libavdevice/xcbgrab.c
+++ b/
libavdevice/xcbgrab.c
@@
-594,10
+594,10
@@
static av_cold int xcbgrab_read_header(AVFormatContext *s)
int screen_num, ret;
const xcb_setup_t *setup;
- c->conn = xcb_connect(s->filename, &screen_num);
+ c->conn = xcb_connect(s->filename
[0] ? s->filename : NULL
, &screen_num);
if ((ret = xcb_connection_has_error(c->conn))) {
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);
}
setup = xcb_get_setup(c->conn);