Merge commit '59c6509d9f0236acbc317198eab76dab8320bced'

* commit '59c6509d9f0236acbc317198eab76dab8320bced':
  mss2: Drop a silly assert

Merged-by: Clément Bœsch <clement@stupeflix.com>

diff --cc libavcodec/mss2.c
index d255dd4337a7d17c7bb039942f124b1825eb6308,866ce478dd56d0dbb4adef86c82896f19f875381..1e24568128bc6ed73cc8e15d3c238e8ea3ff55f8
--- 1/libavcodec/mss2.c
--- 2/libavcodec/mss2.c
+++ b/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);