ffmpeg | branch: master | Michael Niedermayer <[email protected]> | Sun Mar 8
19:44:09 2015 +0100| [3360c6ac0c21cbb229c238197f806da40a8bc295] | committer:
Michael Niedermayer
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 <[email protected]>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3360c6ac0c21cbb229c238197f806da40a8bc295
---
_______________________________________________
ffmpeg-cvslog mailing list
[email protected]
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
