|
|
|
@ -1102,15 +1102,19 @@ static int decode_pic(AVSContext *h) |
|
|
|
|
if (check_for_slice(h)) |
|
|
|
|
skip_count = -1; |
|
|
|
|
if (h->skip_mode_flag && (skip_count < 0)) { |
|
|
|
|
if (get_bits_left(&h->gb) < 1) |
|
|
|
|
if (get_bits_left(&h->gb) < 1) { |
|
|
|
|
ret = AVERROR_INVALIDDATA; |
|
|
|
|
break; |
|
|
|
|
} |
|
|
|
|
skip_count = get_ue_golomb(&h->gb); |
|
|
|
|
} |
|
|
|
|
if (h->skip_mode_flag && skip_count--) { |
|
|
|
|
decode_mb_p(h, P_SKIP); |
|
|
|
|
} else { |
|
|
|
|
if (get_bits_left(&h->gb) < 1) |
|
|
|
|
if (get_bits_left(&h->gb) < 1) { |
|
|
|
|
ret = AVERROR_INVALIDDATA; |
|
|
|
|
break; |
|
|
|
|
} |
|
|
|
|
mb_type = get_ue_golomb(&h->gb) + P_SKIP + h->skip_mode_flag; |
|
|
|
|
if (mb_type > P_8X8) |
|
|
|
|
ret = decode_mb_i(h, mb_type - P_8X8 - 1); |
|
|
|
@ -1125,15 +1129,19 @@ static int decode_pic(AVSContext *h) |
|
|
|
|
if (check_for_slice(h)) |
|
|
|
|
skip_count = -1; |
|
|
|
|
if (h->skip_mode_flag && (skip_count < 0)) { |
|
|
|
|
if (get_bits_left(&h->gb) < 1) |
|
|
|
|
if (get_bits_left(&h->gb) < 1) { |
|
|
|
|
ret = AVERROR_INVALIDDATA; |
|
|
|
|
break; |
|
|
|
|
} |
|
|
|
|
skip_count = get_ue_golomb(&h->gb); |
|
|
|
|
} |
|
|
|
|
if (h->skip_mode_flag && skip_count--) { |
|
|
|
|
ret = decode_mb_b(h, B_SKIP); |
|
|
|
|
} else { |
|
|
|
|
if (get_bits_left(&h->gb) < 1) |
|
|
|
|
if (get_bits_left(&h->gb) < 1) { |
|
|
|
|
ret = AVERROR_INVALIDDATA; |
|
|
|
|
break; |
|
|
|
|
} |
|
|
|
|
mb_type = get_ue_golomb(&h->gb) + B_SKIP + h->skip_mode_flag; |
|
|
|
|
if (mb_type > B_8X8) |
|
|
|
|
ret = decode_mb_i(h, mb_type - B_8X8 - 1); |
|
|
|
|