Merge commit 'd0f7e4a57fbffa0efb204d4274c3dd56fbfff946'
authorHendrik Leppkes <h.leppkes@gmail.com>
Tue, 8 Sep 2015 12:34:09 +0000 (14:34 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Tue, 8 Sep 2015 12:34:09 +0000 (14:34 +0200)
* commit 'd0f7e4a57fbffa0efb204d4274c3dd56fbfff946':
  dxtory: Unify and rework the decoding routines

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
1  2 
libavcodec/dxtory.c

@@@ -314,12 -295,10 +295,11 @@@ static int dxtory_decode_v2(AVCodecCont
          if (ret < 0)
              return ret;
  
 -        init_get_bits(&gb2, src + off + 16, (slice_size - 16) * 8);
 +        if ((ret = init_get_bits8(&gb2, src + off + 16, slice_size - 16)) < 0)
 +            return ret;
-         dx2_decode_slice_565(&gb2, avctx->width, slice_height, dst,
-                              pic->linesize[0], is_565);
  
-         dst += pic->linesize[0] * slice_height;
+         line += decode_slice(&gb2, pic, line, avctx->height - line, lru);
          off += slice_size;
      }