Merge commit 'e0d73fda361729d207e51fa2afd8ba6102e58d98'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 4 Aug 2014 19:33:07 +0000 (21:33 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 4 Aug 2014 19:33:29 +0000 (21:33 +0200)
* commit 'e0d73fda361729d207e51fa2afd8ba6102e58d98':
  avutil: add alias names for gray 8/16 colour spaces

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavutil/pixdesc.c

Simple merge