diff options
author | Janne Grunau <janne-libav@jannau.net> | 2012-12-08 16:36:28 +0400 |
---|---|---|
committer | Janne Grunau <janne-libav@jannau.net> | 2012-12-09 18:51:45 +0400 |
commit | 288bb3da16f50e2ef866ab1b699a1721ee333eb5 (patch) | |
tree | 98f15450010ec040ff613c499974e6af3925c2ec /libavcodec/svq3.c | |
parent | 998c1ee10cd0436b6bf639a796d3614db42c369c (diff) |
svq3: make slice type value unsigned to match svq3_get_ue_golomb return type
Diffstat (limited to 'libavcodec/svq3.c')
-rw-r--r-- | libavcodec/svq3.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libavcodec/svq3.c b/libavcodec/svq3.c index 013dee8dd3..0bfc73ec8d 100644 --- a/libavcodec/svq3.c +++ b/libavcodec/svq3.c @@ -750,6 +750,7 @@ static int svq3_decode_slice_header(AVCodecContext *avctx) MpegEncContext *s = &h->s; const int mb_xy = h->mb_xy; int i, header; + unsigned slice_id; header = get_bits(&s->gb, 8); @@ -784,12 +785,12 @@ static int svq3_decode_slice_header(AVCodecContext *avctx) skip_bits_long(&s->gb, 0); } - if ((i = svq3_get_ue_golomb(&s->gb)) >= 3) { - av_log(h->s.avctx, AV_LOG_ERROR, "illegal slice type %d \n", i); + if ((slice_id = svq3_get_ue_golomb(&s->gb)) >= 3) { + av_log(h->s.avctx, AV_LOG_ERROR, "illegal slice type %d \n", slice_id); return -1; } - h->slice_type = golomb_to_pict_type[i]; + h->slice_type = golomb_to_pict_type[slice_id]; if ((header & 0x9F) == 2) { i = (s->mb_num < 64) ? 6 : (1 + av_log2(s->mb_num - 1)); |