Merge branch 'jbolz_astc_srgb_5x4_8x5' into 'master'
authorPyry Haulos <phaulos@google.com>
Wed, 13 Jan 2016 17:07:52 +0000 (12:07 -0500)
committerPyry Haulos <phaulos@google.com>
Wed, 13 Jan 2016 17:07:52 +0000 (12:07 -0500)
Fix mapping of ASTC/sRGB formats for 5x4 and 8x5 block sizes

See merge request !284


Trivial merge