Commit 1fded9b6 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit 'f36d7831'

* commit 'f36d7831':
  pixdesc: mark gray8 as pseudopal

Conflicts:
	libavutil/pixdesc.c

No change as gray8 was already marked as pseudopal in FFmpeg
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 1724123c f36d7831
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment