Merge commit '1877712c586df2261f2806f45388c77592b89d1e'

* commit '1877712c586df2261f2806f45388c77592b89d1e':
  svq3: move mb_{x,y,xy} to SVQ3Context

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

diff --cc libavcodec/svq3.c
index d671050,2bb957d..0cf9159
--- 1/libavcodec/svq3.c
--- 2/libavcodec/svq3.c
+++ b/libavcodec/svq3.c
@@@ -533,7 -529,7 +536,7 @@@ static av_always_inline void hl_decode_
              int nnz, tr;
              if (dir == DIAG_DOWN_LEFT_PRED || dir == VERT_LEFT_PRED) {
                  const int topright_avail = (sl->topright_samples_available << i) & 0x8000;
-                 av_assert2(sl->mb_y || linesize <= block_offset[i]);
 -                assert(s->mb_y || linesize <= block_offset[i]);
++                av_assert2(s->mb_y || linesize <= block_offset[i]);
                  if (!topright_avail) {
                      tr       = ptr[3 - linesize] * 0x01010101u;
                      topright = (uint8_t *)&tr;
@@@ -978,21 -974,21 +981,21 @@@ static int svq3_decode_slice_header(AVC
      skip_bits1(&h->gb);
      skip_bits(&h->gb, 2);
  
 -    while (get_bits1(&h->gb))
 -        skip_bits(&h->gb, 8);
 +    if (skip_1stop_8data_bits(&h->gb) < 0)
 +        return AVERROR_INVALIDDATA;
  
      /* reset intra predictors and invalidate motion vector references */
-     if (sl->mb_x > 0) {
+     if (s->mb_x > 0) {
          memset(sl->intra4x4_pred_mode + h->mb2br_xy[mb_xy - 1] + 3,
                 -1, 4 * sizeof(int8_t));
-         memset(sl->intra4x4_pred_mode + h->mb2br_xy[mb_xy - sl->mb_x],
-                -1, 8 * sizeof(int8_t) * sl->mb_x);
+         memset(sl->intra4x4_pred_mode + h->mb2br_xy[mb_xy - s->mb_x],
+                -1, 8 * sizeof(int8_t) * s->mb_x);
      }
-     if (sl->mb_y > 0) {
+     if (s->mb_y > 0) {
          memset(sl->intra4x4_pred_mode + h->mb2br_xy[mb_xy - h->mb_stride],
-                -1, 8 * sizeof(int8_t) * (h->mb_width - sl->mb_x));
+                -1, 8 * sizeof(int8_t) * (h->mb_width - s->mb_x));
  
-         if (sl->mb_x > 0)
+         if (s->mb_x > 0)
              sl->intra4x4_pred_mode[h->mb2br_xy[mb_xy - h->mb_stride - 1] + 3] = -1;
      }