diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-08 19:44:09 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-08 19:44:09 +0100 |
| commit | 3360c6ac0c21cbb229c238197f806da40a8bc295 (patch) | |
| tree | aa50113fbfab4d9437326fd349e65e90cb6fb8ae | |
| parent | acfb54c076e25b5f228ab07d364738940e4171d3 (diff) | |
| parent | 5f5b78aca35d07c771f5c4c73a984be9fe04a0b8 (diff) | |
| download | ffmpeg-3360c6ac0c21cbb229c238197f806da40a8bc295.tar.gz | |
Merge commit '5f5b78aca35d07c771f5c4c73a984be9fe04a0b8'
* commit '5f5b78aca35d07c771f5c4c73a984be9fe04a0b8':
xcbgrab: Free the host string after checking the connection
Conflicts:
libavdevice/xcbgrab.c
No change as the bug was not in FFmpeg
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavdevice/xcbgrab.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavdevice/xcbgrab.c b/libavdevice/xcbgrab.c index 477eed700a..17d8f9acee 100644 --- a/libavdevice/xcbgrab.c +++ b/libavdevice/xcbgrab.c @@ -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); |