Merge commit '527bf5f7c6890664b0f1dccd42397f4d204659fe'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Wed, 27 Apr 2016 15:46:54 +0000 (16:46 +0100)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Wed, 27 Apr 2016 15:46:54 +0000 (16:46 +0100)
* commit '527bf5f7c6890664b0f1dccd42397f4d204659fe':
  svq3: move the pred mode variables to SVQ3Context

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
1  2 
libavcodec/svq3.c

@@@ -535,8 -538,8 +545,8 @@@ static av_always_inline void hl_decode_
              uint8_t *topright;
              int nnz, tr;
              if (dir == DIAG_DOWN_LEFT_PRED || dir == VERT_LEFT_PRED) {
-                 const int topright_avail = (sl->topright_samples_available << i) & 0x8000;
+                 const int topright_avail = (s->topright_samples_available << i) & 0x8000;
 -                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;