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)
* 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>

Trivial merge