ffmpeg/libavdevice
Michael Niedermayer 81a045fe17 Merge commit '2c3f29c4894ee50635b846f202296ad79a7c0d33'
* commit '2c3f29c4894ee50635b846f202296ad79a7c0d33':
  xcbgrab: Support empty filename string correctly

Conflicts:
	libavdevice/xcbgrab.c

See: 62eca2f827d441f52125191fd78c96b67a7ba30c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-10 12:33:37 +01:00
..
2014-04-22 20:44:31 +02:00
2014-08-29 18:57:25 +02:00
2012-12-21 00:18:34 +01:00
2014-04-24 05:12:07 +02:00
2014-08-30 18:02:45 +02:00