summaryrefslogtreecommitdiff
path: root/libavcodec/zmbv.c
diff options
context:
space:
mode:
authorKostya Shishkov <kostya.shishkov@gmail.com>2012-03-18 08:48:50 +0100
committerKostya Shishkov <kostya.shishkov@gmail.com>2012-03-19 09:20:39 +0100
commitafc2263bccbffb94c645ca5fcbc7b74b78be5468 (patch)
tree596e9b4a65e4dd9440b61b9d9ea8bfda522a71ee /libavcodec/zmbv.c
parent1744ab9e4628eb2054a88c82cf2d8c1812acd008 (diff)
zmbv: correct indentation
Diffstat (limited to 'libavcodec/zmbv.c')
-rw-r--r--libavcodec/zmbv.c46
1 files changed, 23 insertions, 23 deletions
diff --git a/libavcodec/zmbv.c b/libavcodec/zmbv.c
index a160553c09..62045c087a 100644
--- a/libavcodec/zmbv.c
+++ b/libavcodec/zmbv.c
@@ -484,29 +484,29 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, AVPac
if (zret != Z_OK) {
av_log(avctx, AV_LOG_ERROR, "Inflate reset error: %d\n", zret);
return -1;
- }
-
- tmp = av_realloc(c->cur, avctx->width * avctx->height * (c->bpp / 8));
- if (!tmp)
- return AVERROR(ENOMEM);
- c->cur = tmp;
- tmp = av_realloc(c->prev, avctx->width * avctx->height * (c->bpp / 8));
- if (!tmp)
- return AVERROR(ENOMEM);
- c->prev = tmp;
- c->bx = (c->width + c->bw - 1) / c->bw;
- c->by = (c->height+ c->bh - 1) / c->bh;
- }
-
- if (c->decode_intra == NULL) {
- av_log(avctx, AV_LOG_ERROR, "Error! Got no format or no keyframe!\n");
- return AVERROR_INVALIDDATA;
- }
-
- if (c->comp == 0) { //Uncompressed data
- memcpy(c->decomp_buf, buf, len);
- c->decomp_size = 1;
- } else { // ZLIB-compressed data
+ }
+
+ tmp = av_realloc(c->cur, avctx->width * avctx->height * (c->bpp / 8));
+ if (!tmp)
+ return AVERROR(ENOMEM);
+ c->cur = tmp;
+ tmp = av_realloc(c->prev, avctx->width * avctx->height * (c->bpp / 8));
+ if (!tmp)
+ return AVERROR(ENOMEM);
+ c->prev = tmp;
+ c->bx = (c->width + c->bw - 1) / c->bw;
+ c->by = (c->height + c->bh - 1) / c->bh;
+ }
+
+ if (c->decode_intra == NULL) {
+ av_log(avctx, AV_LOG_ERROR, "Error! Got no format or no keyframe!\n");
+ return AVERROR_INVALIDDATA;
+ }
+
+ if (c->comp == 0) { //Uncompressed data
+ memcpy(c->decomp_buf, buf, len);
+ c->decomp_size = 1;
+ } else { // ZLIB-compressed data
c->zstream.total_in = c->zstream.total_out = 0;
c->zstream.next_in = buf;
c->zstream.avail_in = len;