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)
* qatar/master:
  dxtory: compressed RGB555/RGB565 decoding support

Conflicts:
libavcodec/dxtory.c

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

@@@ -169,7 -169,9 +169,9 @@@ static int dxtory_decode_v1_444(AVCodec
      return 0;
  }
  
 -const uint8_t def_lru[8] = { 0x00, 0x20, 0x40, 0x60, 0x80, 0xA0, 0xC0, 0xFF };
 -const uint8_t def_lru_555[8] = { 0x00, 0x08, 0x10, 0x18, 0x1F };
 -const uint8_t def_lru_565[8] = { 0x00, 0x08, 0x10, 0x20, 0x30, 0x3F };
 +static const uint8_t def_lru[8] = { 0x00, 0x20, 0x40, 0x60, 0x80, 0xA0, 0xC0, 0xFF };
++static const uint8_t def_lru_555[8] = { 0x00, 0x08, 0x10, 0x18, 0x1F };
++static const uint8_t def_lru_565[8] = { 0x00, 0x08, 0x10, 0x20, 0x30, 0x3F };
  
  static inline uint8_t decode_sym(GetBitContext *gb, uint8_t lru[8])
  {