Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 25 Jan 2014 00:39:19 +0000 (01:39 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 25 Jan 2014 00:39:19 +0000 (01:39 +0100)
commit4b84a69ebb353409cb17b0df02812dfa5c34b150
tree1575c12cd4fca8da40fd59d9719a54505e91956b
parent2d0d1f7eb3f74449063a4e9f770714f94920b720
parent28e1eed3c2e7e944f1d73dc749076943aeb4c13c
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  dxtory: compressed RGB555/RGB565 decoding support

Conflicts:
libavcodec/dxtory.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/dxtory.c