Merge remote-tracking branch 'cehoyos/master'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 6 Mar 2013 04:37:09 +0000 (05:37 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 6 Mar 2013 04:37:14 +0000 (05:37 +0100)
commit28adecf0fa1fa56db17b1f0e7711acb68baf00e7
treea70970ed0c71408e1ff5780b2fabe077009f2daa
parenta3541896c6f443177a4f715cd71d1bff7ba8f380
parent34e7a3d74cce2ba79905b8ed965c97c119364b39
Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Move the iconv test to the bottom of configure.
  Make 32bit zmbv colour-space opaque.
  Use uint8_t instead of uint16_t pointer in kega decoder.
  kgv1dec: Simplify kega decoding by using memcpy instead of loops

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