[FFmpeg-cvslog] Merge commit '65e78a2e4b111627c0ebdf2c9baec95e5e21560d'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Sep  3 13:58:41 2014 +0200| [7509a95656cd0bf663ee2654763d8840d1662a88] | committer: Michael Niedermayer

Merge commit '65e78a2e4b111627c0ebdf2c9baec95e5e21560d'

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

Conflicts:
	libavdevice/x11grab.c

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

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