ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Thu Aug 28
22:06:48 2014 +0200| [c6a3b009249892e7cfac59ca3c2b489e2c88b22b] | committer:
Michael Niedermayer
Merge commit '58396e806c65fe0eb00e6ccf1980f810cdceed05'
* commit '58396e806c65fe0eb00e6ccf1980f810cdceed05':
x11grab: Use a typedef for the context, as most other code does
Conflicts:
libavdevice/x11grab.c
Merged-by: Michael Niedermayer <michae...@gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c6a3b009249892e7cfac59ca3c2b489e2c88b22b
---
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
