Merge commit '5f5b78aca35d07c771f5c4c73a984be9fe04a0b8'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 8 Mar 2015 18:44:09 +0000 (19:44 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 8 Mar 2015 18:44:09 +0000 (19:44 +0100)
commit3360c6ac0c21cbb229c238197f806da40a8bc295
treeaa50113fbfab4d9437326fd349e65e90cb6fb8ae
parentacfb54c076e25b5f228ab07d364738940e4171d3
parent5f5b78aca35d07c771f5c4c73a984be9fe04a0b8
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>
libavdevice/xcbgrab.c