OSDN Git Service

Merge commit '9a9fb710bcf4657e030467cfe2556cb0e2c01afc'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Sun, 8 May 2016 22:48:55 +0000 (23:48 +0100)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Sun, 8 May 2016 22:49:04 +0000 (23:49 +0100)
commit6c007036850c573a7db3c82fc5f184374b8b16b1
tree1c34a0557c51b357377f6fe40295f90c73e53b33
parent486776d06f6e0ee9d2bc0c56471260291ba56737
parent9a9fb710bcf4657e030467cfe2556cb0e2c01afc
Merge commit '9a9fb710bcf4657e030467cfe2556cb0e2c01afc'

* commit '9a9fb710bcf4657e030467cfe2556cb0e2c01afc':
  dds: Add support for rgb555 files

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
libavcodec/dds.c