Merge commit '58396e806c65fe0eb00e6ccf1980f810cdceed05'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 28 Aug 2014 20:06:48 +0000 (22:06 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 28 Aug 2014 20:06:48 +0000 (22:06 +0200)
commitc6a3b009249892e7cfac59ca3c2b489e2c88b22b
tree3ce1139ecbf234918b13531d97e6851829fa6c28
parent1fc396318833280a520bf568d5605791decf87d7
parent58396e806c65fe0eb00e6ccf1980f810cdceed05
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 <michaelni@gmx.at>
libavdevice/x11grab.c