[FFmpeg-cvslog] Merge commit '4ad1eba011860224831ce0bb3123f6f55716b68a'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Oct 28 11:16:17 2014 +0100| [c2e995674fc2ed2a15082959ed36b7c9865c01f1] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c2e995674fc2ed2a15082959ed36b7c9865c01f1
---