[FFmpeg-cvslog] Merge commit 'e0d73fda361729d207e51fa2afd8ba6102e58d98'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Aug  4 21:33:07 2014 +0200| [0b25261d29c6b348e2dccc2985090cf10a60c34f] | committer: Michael Niedermayer

Merge commit 'e0d73fda361729d207e51fa2afd8ba6102e58d98'

* commit 'e0d73fda361729d207e51fa2afd8ba6102e58d98':
  avutil: add alias names for gray 8/16 colour spaces

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

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