From: Michael Niedermayer <[email protected]> Fixes CID1254664
Signed-off-by: Michael Niedermayer <[email protected]> Conflicts: libavdevice/xcbgrab.c --- libavdevice/xcbgrab.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/libavdevice/xcbgrab.c b/libavdevice/xcbgrab.c index 3aaaf0b..01ad744 100644 --- a/libavdevice/xcbgrab.c +++ b/libavdevice/xcbgrab.c @@ -599,14 +599,12 @@ static av_cold int xcbgrab_read_header(AVFormatContext *s) const xcb_setup_t *setup; char *display_name = av_strdup(s->filename); - if (s->filename) { - if (!display_name) - return AVERROR(ENOMEM); + 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); - } + 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[0] ? display_name : NULL, &screen_num); -- 1.7.10.4 _______________________________________________ libav-devel mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-devel
