generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

zmbv: correct indentation

Browse Source
This commit is contained in:
Kostya Shishkov
2012-03-18 08:48:50 +01:00
parent 1744ab9e46
commit afc2263bcc
1 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
libavcodec/zmbv.c
View File

@@ -484,29 +484,29 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, AVPac
if (zret != Z_OK) { if (zret != Z_OK) {
av_log(avctx, AV_LOG_ERROR, "Inflate reset error: %d\n", zret); av_log(avctx, AV_LOG_ERROR, "Inflate reset error: %d\n", zret);
return -1; return -1;
} }
tmp = av_realloc(c->cur, avctx->width * avctx->height * (c->bpp / 8)); tmp = av_realloc(c->cur, avctx->width * avctx->height * (c->bpp / 8));
if (!tmp) if (!tmp)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
c->cur = tmp; c->cur = tmp;
tmp = av_realloc(c->prev, avctx->width * avctx->height * (c->bpp / 8)); tmp = av_realloc(c->prev, avctx->width * avctx->height * (c->bpp / 8));
if (!tmp) if (!tmp)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
c->prev = tmp; c->prev = tmp;
c->bx = (c->width + c->bw - 1) / c->bw; c->bx = (c->width + c->bw - 1) / c->bw;
c->by = (c->height+ c->bh - 1) / c->bh; c->by = (c->height + c->bh - 1) / c->bh;
} }
if (c->decode_intra == NULL) { if (c->decode_intra == NULL) {
av_log(avctx, AV_LOG_ERROR, "Error! Got no format or no keyframe!\n"); av_log(avctx, AV_LOG_ERROR, "Error! Got no format or no keyframe!\n");
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
if (c->comp == 0) { //Uncompressed data if (c->comp == 0) { //Uncompressed data
memcpy(c->decomp_buf, buf, len); memcpy(c->decomp_buf, buf, len);
c->decomp_size = 1; c->decomp_size = 1;
} else { // ZLIB-compressed data } else { // ZLIB-compressed data
c->zstream.total_in = c->zstream.total_out = 0; c->zstream.total_in = c->zstream.total_out = 0;
c->zstream.next_in = buf; c->zstream.next_in = buf;
c->zstream.avail_in = len; c->zstream.avail_in = len;