Merge commit '9fd2bf09dbc630484d9e88a1d27f7e8508b70a2c'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Sun, 22 Nov 2015 14:38:57 +0000 (14:38 +0000)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Sun, 22 Nov 2015 14:38:57 +0000 (14:38 +0000)
commit3c110b009b8efd3650f1b8caf31c331ee775f0ee
treea26ed9d01cad9abf57f7d21464604c0a3159d87e
parent5b4be0c0394707b3e0502f9514c6ac9167c48015
parent9fd2bf09dbc630484d9e88a1d27f7e8508b70a2c
Merge commit '9fd2bf09dbc630484d9e88a1d27f7e8508b70a2c'

These are all no-ops.

* commit '9fd2bf09dbc630484d9e88a1d27f7e8508b70a2c':
  hqx: correct type and size check of info_offset
  dds: disable palette flag for compressed images
  segafilm: Fix current_sample after seeking and avio_seek return type

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>