Merge remote-tracking branch 'cehoyos/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 5 Jul 2014 02:12:08 +0000 (04:12 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 5 Jul 2014 02:12:12 +0000 (04:12 +0200)
commitd5818c37f3219a4c6929c0401e6eacbfef3b843e
tree52054eb7730bee039a6b690088512e0526fdb436
parent4216a5082bee6f5132702f5542d986ad4dcc1797
parent810294ce3d3d9cceb3670a938379e2b2cba6cdc9
Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Use os/2 palette even if it contains less than 256 entries.
  Assume that old bmps do not contain transparency information.
  Do not detect jp2 images as mov files.

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