[FFmpeg-cvslog] zmbv: correct indentation
Kostya Shishkov
git at videolan.org
Tue Mar 20 00:16:53 CET 2012
ffmpeg | branch: master | Kostya Shishkov <kostya.shishkov at gmail.com> | Sun Mar 18 08:48:50 2012 +0100| [afc2263bccbffb94c645ca5fcbc7b74b78be5468] | committer: Kostya Shishkov
zmbv: correct indentation
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=afc2263bccbffb94c645ca5fcbc7b74b78be5468
---
libavcodec/zmbv.c | 46 +++++++++++++++++++++++-----------------------
1 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/libavcodec/zmbv.c b/libavcodec/zmbv.c
index a160553..62045c0 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;
More information about the ffmpeg-cvslog
mailing list