[FFmpeg-cvslog] Merge commit '312a9ef04bf6b55e68e4a61694b169cd3cc69bb8'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Mar 24 01:55:19 2015 +0100| [3e3995619807b01166df5f3edd1edf64af211b1c] | committer: Michael Niedermayer

Merge commit '312a9ef04bf6b55e68e4a61694b169cd3cc69bb8'

* commit '312a9ef04bf6b55e68e4a61694b169cd3cc69bb8':
  pixfmt: Update documentation with prefixed pixel formats

Conflicts:
	libavutil/pixfmt.h

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

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