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)
* 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>

Trivial merge