ffmpeg/libavdevice
Michael Niedermayer 3360c6ac0c 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>
2015-03-08 19:44:09 +01:00
..
2015-01-26 02:04:30 -07:00
2015-01-26 02:04:30 -07:00
2012-12-21 00:18:34 +01:00
2014-04-24 05:12:07 +02:00
2015-03-06 21:35:00 +01:00
2014-08-30 18:02:45 +02:00