[FFmpeg-cvslog] Merge commit '20e82b41fcad23ebbb18d89948aebfcc53921198'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Aug 28 21:39:19 2014 +0200| [65c9e2d0030d76c055461e25e22b9e8fa641560d] | committer: Michael Niedermayer

Merge commit '20e82b41fcad23ebbb18d89948aebfcc53921198'

* commit '20e82b41fcad23ebbb18d89948aebfcc53921198':
  x11grab: Small near-cosmetic refactorings

Conflicts:
	libavdevice/x11grab.c

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

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