RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Michael Niedermayer 2015-03-08 19:44:09 +01:00
parent acfb54c076 5f5b78aca3
commit 3360c6ac0c
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libavdevice/xcbgrab.c
View File

@ -621,6 +621,7 @@ static av_cold int xcbgrab_read_header(AVFormatContext *s)
s->filename[0] ? 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);
c->screen = get_screen(setup, screen_num); c->screen = get_screen(setup, screen_num);