diff options
| author | Kostya Shishkov <kostya.shishkov@gmail.com> | 2012-11-11 15:00:38 +0100 |
|---|---|---|
| committer | Kostya Shishkov <kostya.shishkov@gmail.com> | 2012-11-11 16:07:42 +0100 |
| commit | 6d93308c0ca3783b3278aef8e6e64d8f0558f319 (patch) | |
| tree | 03d45a3ac4b451bb268d08d6118a9c7a6fbce006 /libavcodec | |
| parent | b077eb07805dc5d139b2f118ddb122cc9df8b87a (diff) | |
| download | ffmpeg-6d93308c0ca3783b3278aef8e6e64d8f0558f319.tar.gz | |
mss2: reindent after last commit
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/mss2.c | 68 |
1 files changed, 34 insertions, 34 deletions
diff --git a/libavcodec/mss2.c b/libavcodec/mss2.c index ceeff5a32d..5f99b7afa4 100644 --- a/libavcodec/mss2.c +++ b/libavcodec/mss2.c @@ -657,54 +657,54 @@ static int mss2_decode_frame(AVCodecContext *avctx, void *data, int *data_size, if (c->slice_split) ff_mss12_slicecontext_reset(&ctx->sc[1]); } - if (is_rle) { - init_get_bits(&gb, buf, buf_size * 8); - if (ret = decode_rle(&gb, c->pal_pic, c->pal_stride, - c->rgb_pic, c->rgb_stride, c->pal, keyframe, - ctx->split_position, 0, - avctx->width, avctx->height)) - return ret; - align_get_bits(&gb); - - if (c->slice_split) + if (is_rle) { + init_get_bits(&gb, buf, buf_size * 8); if (ret = decode_rle(&gb, c->pal_pic, c->pal_stride, c->rgb_pic, c->rgb_stride, c->pal, keyframe, - ctx->split_position, 1, + ctx->split_position, 0, avctx->width, avctx->height)) return ret; + align_get_bits(&gb); - align_get_bits(&gb); - buf += get_bits_count(&gb) >> 3; - buf_size -= get_bits_count(&gb) >> 3; - } else if (!implicit_rect || wmv9_mask != -1) { - if (c->corrupted) - return AVERROR_INVALIDDATA; - bytestream2_init(&gB, buf, buf_size + ARITH2_PADDING); - arith2_init(&acoder, &gB); - c->keyframe = keyframe; - if (c->corrupted = ff_mss12_decode_rect(&ctx->sc[0], &acoder, 0, 0, - avctx->width, - ctx->split_position)) - return AVERROR_INVALIDDATA; + if (c->slice_split) + if (ret = decode_rle(&gb, c->pal_pic, c->pal_stride, + c->rgb_pic, c->rgb_stride, c->pal, keyframe, + ctx->split_position, 1, + avctx->width, avctx->height)) + return ret; - buf += arith2_get_consumed_bytes(&acoder); - buf_size -= arith2_get_consumed_bytes(&acoder); - if (c->slice_split) { - if (buf_size < 1) + align_get_bits(&gb); + buf += get_bits_count(&gb) >> 3; + buf_size -= get_bits_count(&gb) >> 3; + } else if (!implicit_rect || wmv9_mask != -1) { + if (c->corrupted) return AVERROR_INVALIDDATA; bytestream2_init(&gB, buf, buf_size + ARITH2_PADDING); arith2_init(&acoder, &gB); - if (c->corrupted = ff_mss12_decode_rect(&ctx->sc[1], &acoder, 0, - ctx->split_position, + c->keyframe = keyframe; + if (c->corrupted = ff_mss12_decode_rect(&ctx->sc[0], &acoder, 0, 0, avctx->width, - avctx->height - ctx->split_position)) + ctx->split_position)) return AVERROR_INVALIDDATA; buf += arith2_get_consumed_bytes(&acoder); buf_size -= arith2_get_consumed_bytes(&acoder); - } - } else - memset(c->pal_pic, 0, c->pal_stride * avctx->height); + if (c->slice_split) { + if (buf_size < 1) + return AVERROR_INVALIDDATA; + bytestream2_init(&gB, buf, buf_size + ARITH2_PADDING); + arith2_init(&acoder, &gB); + if (c->corrupted = ff_mss12_decode_rect(&ctx->sc[1], &acoder, 0, + ctx->split_position, + avctx->width, + avctx->height - ctx->split_position)) + return AVERROR_INVALIDDATA; + + buf += arith2_get_consumed_bytes(&acoder); + buf_size -= arith2_get_consumed_bytes(&acoder); + } + } else + memset(c->pal_pic, 0, c->pal_stride * avctx->height); } if (has_wmv9) { |