Merge commit '65e78a2e4b111627c0ebdf2c9baec95e5e21560d'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 3 Sep 2014 11:58:41 +0000 (13:58 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 3 Sep 2014 11:58:41 +0000 (13:58 +0200)
commit7509a95656cd0bf663ee2654763d8840d1662a88
tree5dbcfbe890de86e7895a126da4e675b73aa2ed46
parent33bf66af02fe07ad810bea792782388c34be5e66
parent65e78a2e4b111627c0ebdf2c9baec95e5e21560d
Merge commit '65e78a2e4b111627c0ebdf2c9baec95e5e21560d'

* commit '65e78a2e4b111627c0ebdf2c9baec95e5e21560d':
  x11grab: Refactor pixel format parsing

Conflicts:
libavdevice/x11grab.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavdevice/x11grab.c