Get rid of ugly hacks, also add support for more pixel formats.
Signed-off-by: NPaul B Mahol <onemda@gmail.com>