[FFmpeg-cvslog] Merge commit 'a64a5773ea5f7337cd1d87cfdf511914d317fe81'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu May 28 22:24:12 2015 +0200| [e2f3ea1cbb64e64c9ea59a56b2ee00a6e64f4de0] | committer: Michael Niedermayer

Merge commit 'a64a5773ea5f7337cd1d87cfdf511914d317fe81'

* commit 'a64a5773ea5f7337cd1d87cfdf511914d317fe81':
  pixfmt: remove misleading and broken documentation

Conflicts:
	libavutil/pixfmt.h

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

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