[FFmpeg-cvslog] zerocodec: Cosmetics
Derek Buitenhuis
git at videolan.org
Sun Aug 5 23:06:30 CEST 2012
ffmpeg | branch: master | Derek Buitenhuis <derek.buitenhuis at gmail.com> | Fri Aug 3 21:41:24 2012 -0400| [29facc1e916c4be0324b41634c1d0b8c5fd31fa8] | committer: Derek Buitenhuis
zerocodec: Cosmetics
Be consistent with error messages and code formatting.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis at gmail.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=29facc1e916c4be0324b41634c1d0b8c5fd31fa8
---
libavcodec/zerocodec.c | 22 ++++++++++------------
1 file changed, 10 insertions(+), 12 deletions(-)
diff --git a/libavcodec/zerocodec.c b/libavcodec/zerocodec.c
index 4f43d52..8d46bfd 100644
--- a/libavcodec/zerocodec.c
+++ b/libavcodec/zerocodec.c
@@ -23,7 +23,7 @@
typedef struct {
AVFrame previous_frame;
z_stream zstream;
- int size;
+ int size;
} ZeroCodecContext;
static int zerocodec_decode_frame(AVCodecContext *avctx, void *data,
@@ -33,7 +33,8 @@ static int zerocodec_decode_frame(AVCodecContext *avctx, void *data,
AVFrame *pic = avctx->coded_frame;
AVFrame *prev_pic = &zc->previous_frame;
z_stream *zstream = &zc->zstream;
- uint8_t *prev = prev_pic->data[0], *dst;
+ uint8_t *prev = prev_pic->data[0];
+ uint8_t *dst;
int i, j, zret;
pic->reference = 3;
@@ -43,7 +44,7 @@ static int zerocodec_decode_frame(AVCodecContext *avctx, void *data,
pic->pict_type = AV_PICTURE_TYPE_I;
} else {
if (!prev) {
- av_log(avctx, AV_LOG_ERROR, "Missing reference frame!\n");
+ av_log(avctx, AV_LOG_ERROR, "Missing reference frame.\n");
return AVERROR_INVALIDDATA;
}
pic->key_frame = 0;
@@ -56,16 +57,15 @@ static int zerocodec_decode_frame(AVCodecContext *avctx, void *data,
}
zret = inflateReset(zstream);
-
if (zret != Z_OK) {
- av_log(avctx, AV_LOG_ERROR, "Could not reset inflate: %d\n", zret);
- return AVERROR(EINVAL);
+ av_log(avctx, AV_LOG_ERROR, "Could not reset inflate: %d.\n", zret);
+ return AVERROR_INVALIDDATA;
}
zstream->next_in = avpkt->data;
zstream->avail_in = avpkt->size;
- dst = pic->data[0];
+ dst = pic->data[0];
/**
* ZeroCodec has very simple interframe compression. If a value
@@ -79,8 +79,8 @@ static int zerocodec_decode_frame(AVCodecContext *avctx, void *data,
zret = inflate(zstream, Z_SYNC_FLUSH);
if (zret != Z_OK && zret != Z_STREAM_END) {
av_log(avctx, AV_LOG_ERROR,
- "Inflate failed with return code: %d\n", zret);
- return AVERROR(EINVAL);
+ "Inflate failed with return code: %d.\n", zret);
+ return AVERROR_INVALIDDATA;
}
if (!(avpkt->flags & AV_PKT_FLAG_KEY))
@@ -138,14 +138,12 @@ static av_cold int zerocodec_decode_init(AVCodecContext *avctx)
zstream->opaque = Z_NULL;
zret = inflateInit(zstream);
-
if (zret != Z_OK) {
- av_log(avctx, AV_LOG_ERROR, "Could not initialize inflate: %d\n", zret);
+ av_log(avctx, AV_LOG_ERROR, "Could not initialize inflate: %d.\n", zret);
return AVERROR(ENOMEM);
}
avctx->coded_frame = avcodec_alloc_frame();
-
if (!avctx->coded_frame) {
av_log(avctx, AV_LOG_ERROR, "Could not allocate frame buffer.\n");
zerocodec_decode_close(avctx);
More information about the ffmpeg-cvslog
mailing list