diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-07-05 04:12:08 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-05 04:12:12 +0200 |
| commit | d5818c37f3219a4c6929c0401e6eacbfef3b843e (patch) | |
| tree | 52054eb7730bee039a6b690088512e0526fdb436 /tools | |
| parent | 4216a5082bee6f5132702f5542d986ad4dcc1797 (diff) | |
| parent | 810294ce3d3d9cceb3670a938379e2b2cba6cdc9 (diff) | |
| download | ffmpeg-d5818c37f3219a4c6929c0401e6eacbfef3b843e.tar.gz | |
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>
Diffstat (limited to 'tools')
0 files changed, 0 insertions, 0 deletions