Merge commit '312a9ef04bf6b55e68e4a61694b169cd3cc69bb8'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 24 Mar 2015 00:55:19 +0000 (01:55 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 24 Mar 2015 00:56:11 +0000 (01:56 +0100)
* commit '312a9ef04bf6b55e68e4a61694b169cd3cc69bb8':
  pixfmt: Update documentation with prefixed pixel formats

Conflicts:
libavutil/pixfmt.h

See: 231e33f050386e170cba33188df7b822b16ca099
Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavutil/pixfmt.h

Simple merge