Merge commit '59c6509d9f0236acbc317198eab76dab8320bced'
authorClément Bœsch <clement@stupeflix.com>
Wed, 29 Jun 2016 09:42:42 +0000 (11:42 +0200)
committerClément Bœsch <clement@stupeflix.com>
Wed, 29 Jun 2016 09:42:42 +0000 (11:42 +0200)
* commit '59c6509d9f0236acbc317198eab76dab8320bced':
  mss2: Drop a silly assert

Merged-by: Clément Bœsch <clement@stupeflix.com>
1  2 
libavcodec/mss2.c

@@@ -482,11 -476,7 +482,8 @@@ static int mss2_decode_frame(AVCodecCon
      Rectangle wmv9rects[MAX_WMV9_RECTANGLES], *r;
      int used_rects = 0, i, implicit_rect = 0, av_uninit(wmv9_mask);
  
-     av_assert0(AV_INPUT_BUFFER_PADDING_SIZE >=
-                ARITH2_PADDING + (MIN_CACHE_BITS + 7) / 8);
 -    init_get_bits(&gb, buf, buf_size * 8);
 +    if ((ret = init_get_bits8(&gb, buf, buf_size)) < 0)
 +        return ret;
  
      if (keyframe = get_bits1(&gb))
          skip_bits(&gb, 7);