Merge commit '1848a154a49d18c1f31f54ee75c7445dc49a7ecc'

* commit '1848a154a49d18c1f31f54ee75c7445dc49a7ecc':
  svq3: stop using H264Context.gb

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

diff --cc libavcodec/svq3.c
index 2223d10,c039e74..de53204
--- 1/libavcodec/svq3.c
--- 2/libavcodec/svq3.c
+++ b/libavcodec/svq3.c
@@@ -848,9 -842,9 +849,9 @@@ static int svq3_decode_mb(SVQ3Context *
  
              /* decode prediction codes for luma blocks */
              for (i = 0; i < 16; i += 2) {
-                 vlc = svq3_get_ue_golomb(&h->gb);
+                 vlc = svq3_get_ue_golomb(&s->gb_slice);
  
 -                if (vlc >= 25) {
 +                if (vlc >= 25U) {
                      av_log(h->avctx, AV_LOG_ERROR,
                             "luma prediction:%"PRIu32"\n", vlc);
                      return -1;
@@@ -926,7 -920,7 +927,7 @@@
  
      if (!IS_INTRA16x16(mb_type) &&
          (!IS_SKIP(mb_type) || s->pict_type == AV_PICTURE_TYPE_B)) {
-         if ((vlc = svq3_get_ue_golomb(&h->gb)) >= 48U){
 -        if ((vlc = svq3_get_ue_golomb(&s->gb_slice)) >= 48) {
++        if ((vlc = svq3_get_ue_golomb(&s->gb_slice)) >= 48U){
              av_log(h->avctx, AV_LOG_ERROR, "cbp_vlc=%"PRIu32"\n", vlc);
              return -1;
          }
@@@ -1043,14 -1037,14 +1044,14 @@@ static int svq3_decode_slice_header(AVC
  
          memcpy(s->slice_buf, s->gb.buffer + s->gb.index / 8, slice_bytes);
  
-         init_get_bits(&h->gb, s->slice_buf, slice_bits);
+         init_get_bits(&s->gb_slice, s->slice_buf, slice_bits);
  
          if (s->watermark_key) {
-             uint32_t header = AV_RL32(&h->gb.buffer[1]);
-             AV_WL32(&h->gb.buffer[1], header ^ s->watermark_key);
+             uint32_t header = AV_RL32(&s->gb_slice.buffer[1]);
+             AV_WL32(&s->gb_slice.buffer[1], header ^ s->watermark_key);
          }
          if (length > 0) {
 -            memcpy(s->slice_buf, &s->slice_buf[slice_length], length - 1);
 +            memmove(s->slice_buf, &s->slice_buf[slice_length], length - 1);
          }
          skip_bits_long(&s->gb, slice_bytes * 8);
      }
@@@ -1064,26 -1058,26 +1065,26 @@@
  
      if ((header & 0x9F) == 2) {
          i = (s->mb_num < 64) ? 6 : (1 + av_log2(s->mb_num - 1));
-         get_bits(&h->gb, i);
+         get_bits(&s->gb_slice, i);
      } else {
-         skip_bits1(&h->gb);
+         skip_bits1(&s->gb_slice);
      }
  
-     s->slice_num      = get_bits(&h->gb, 8);
-     s->qscale         = get_bits(&h->gb, 5);
-     s->adaptive_quant = get_bits1(&h->gb);
+     s->slice_num      = get_bits(&s->gb_slice, 8);
+     s->qscale         = get_bits(&s->gb_slice, 5);
+     s->adaptive_quant = get_bits1(&s->gb_slice);
  
      /* unknown fields */
-     skip_bits1(&h->gb);
+     skip_bits1(&s->gb_slice);
  
 -    if (s->unknown_flag)
 +    if (s->has_watermark)
-         skip_bits1(&h->gb);
+         skip_bits1(&s->gb_slice);
  
-     skip_bits1(&h->gb);
-     skip_bits(&h->gb, 2);
+     skip_bits1(&s->gb_slice);
+     skip_bits(&s->gb_slice, 2);
  
-     if (skip_1stop_8data_bits(&h->gb) < 0)
 -    while (get_bits1(&s->gb_slice))
 -        skip_bits(&s->gb_slice, 8);
++    if (skip_1stop_8data_bits(&s->gb_slice) < 0)
 +        return AVERROR_INVALIDDATA;
  
      /* reset intra predictors and invalidate motion vector references */
      if (s->mb_x > 0) {
@@@ -1588,18 -1545,6 +1589,18 @@@ static int svq3_decode_frame(AVCodecCon
                             h->low_delay);
      }
  
-     left = buf_size*8 - get_bits_count(&h->gb);
++    left = buf_size*8 - get_bits_count(&s->gb_slice);
 +
 +    if (s->mb_y != h->mb_height || s->mb_x != h->mb_width) {
 +        av_log(avctx, AV_LOG_INFO, "frame num %d incomplete pic x %d y %d left %d\n", avctx->frame_number, s->mb_y, s->mb_x, left);
 +        //av_hex_dump(stderr, buf+buf_size-8, 8);
 +    }
 +
 +    if (left < 0) {
 +        av_log(avctx, AV_LOG_ERROR, "frame num %d left %d\n", avctx->frame_number, left);
 +        return -1;
 +    }
 +
      if (s->pict_type == AV_PICTURE_TYPE_B || h->low_delay)
          ret = av_frame_ref(data, s->cur_pic->f);
      else if (s->last_pic->f->data[0])