Merge commit '4ad1eba011860224831ce0bb3123f6f55716b68a'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 28 Oct 2014 10:16:17 +0000 (11:16 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 28 Oct 2014 10:20:20 +0000 (11:20 +0100)
commitc2e995674fc2ed2a15082959ed36b7c9865c01f1
treeb826779137aa92bc258fed7fa318c8aa0b1e799f
parentdd5123a04c67f74024128447e8ca9642241d6d45
parent4ad1eba011860224831ce0bb3123f6f55716b68a
Merge commit '4ad1eba011860224831ce0bb3123f6f55716b68a'

* commit '4ad1eba011860224831ce0bb3123f6f55716b68a':
  lavd: fix building x11grab after a6674d2

no change as the buggy line was not in FFmpeg

Merged-by: Michael Niedermayer <michaelni@gmx.at>