ffmpeg | branch: master | Michael Niedermayer <[email protected]> | Sun Oct 5
03:35:22 2014 +0200| [345160a9cdf27c928c2430101513c5882e6f9fe1] | committer:
Michael Niedermayer
Merge commit '2a5ac99e6e06078713f684fee2466c91f677b303'
* commit '2a5ac99e6e06078713f684fee2466c91f677b303':
x11grab: Check the XQueryPointer return value
Conflicts:
libavdevice/x11grab.c
See: 69c34a6ac986e31b5286a1d566617ec25b93e6a7
Merged-by: Michael Niedermayer <[email protected]>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=345160a9cdf27c928c2430101513c5882e6f9fe1
---
_______________________________________________
ffmpeg-cvslog mailing list
[email protected]
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
