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)
commit1fded9b69cc7af81fbc9ebd957a35e5d544eafb4
treed035cf42e079c100cd5695387d21653a83721499
parent1724123c65b55ec3a6d7a8b2236f9d71b4129132
parentf36d7831d96aeb072db5a2b78892a534d96e288e
Merge commit 'f36d7831d96aeb072db5a2b78892a534d96e288e'

* 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>