Merge commit 'f36d7831d96aeb072db5a2b78892a534d96e288e'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 23 May 2013 08:33:45 +0000 (10:33 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 23 May 2013 08:33:45 +0000 (10:33 +0200)
* commit 'f36d7831d96aeb072db5a2b78892a534d96e288e':
  pixdesc: mark gray8 as pseudopal

Conflicts:
libavutil/pixdesc.c

No change as gray8 was already marked as pseudopal in FFmpeg

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

Trivial merge