Commit 3360c6ac authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '5f5b78ac'

* commit '5f5b78ac':
  xcbgrab: Free the host string after checking the connection

Conflicts:
	libavdevice/xcbgrab.c

No change as the bug was not in FFmpeg
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents acfb54c0 5f5b78ac
......@@ -621,6 +621,7 @@ static av_cold int xcbgrab_read_header(AVFormatContext *s)
s->filename[0] ? s->filename : "default", ret);
return AVERROR(EIO);
}
setup = xcb_get_setup(c->conn);
c->screen = get_screen(setup, screen_num);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment