aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorPaul B Mahol <onemda@gmail.com>2018-09-08 20:09:27 +0200
committerPaul B Mahol <onemda@gmail.com>2018-09-08 20:09:27 +0200
commit94437e440925cc1c2eec2d76300418d976f956d0 (patch)
treec7d7d37bfbd4860ced2af60a6a93e14211bc1115 /libavcodec
parentaa76bdea1fd541e93c0960583107b464d852c564 (diff)
downloadffmpeg-94437e440925cc1c2eec2d76300418d976f956d0.tar.gz
avcodecc/cscd: fix some obvious style issues
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/cscd.c71
1 files changed, 38 insertions, 33 deletions
diff --git a/libavcodec/cscd.c b/libavcodec/cscd.c
index 707674535c..8781df110c 100644
--- a/libavcodec/cscd.c
+++ b/libavcodec/cscd.c
@@ -38,7 +38,8 @@ typedef struct CamStudioContext {
} CamStudioContext;
static void copy_frame_default(AVFrame *f, const uint8_t *src,
- int linelen, int height) {
+ int linelen, int height)
+{
int i, src_stride = FFALIGN(linelen, 4);
uint8_t *dst = f->data[0];
dst += (height - 1) * f->linesize[0];
@@ -50,7 +51,8 @@ static void copy_frame_default(AVFrame *f, const uint8_t *src,
}
static void add_frame_default(AVFrame *f, const uint8_t *src,
- int linelen, int height) {
+ int linelen, int height)
+{
int i, j, src_stride = FFALIGN(linelen, 4);
uint8_t *dst = f->data[0];
dst += (height - 1) * f->linesize[0];
@@ -63,7 +65,8 @@ static void add_frame_default(AVFrame *f, const uint8_t *src,
}
static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
- AVPacket *avpkt) {
+ AVPacket *avpkt)
+{
const uint8_t *buf = avpkt->data;
int buf_size = avpkt->size;
CamStudioContext *c = avctx->priv_data;
@@ -79,30 +82,30 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
// decompress data
switch ((buf[0] >> 1) & 7) {
- case 0: { // lzo compression
- int outlen = c->decomp_size, inlen = buf_size - 2;
- if (av_lzo1x_decode(c->decomp_buf, &outlen, &buf[2], &inlen) || outlen) {
- av_log(avctx, AV_LOG_ERROR, "error during lzo decompression\n");
- return AVERROR_INVALIDDATA;
- }
- break;
+ case 0: { // lzo compression
+ int outlen = c->decomp_size, inlen = buf_size - 2;
+ if (av_lzo1x_decode(c->decomp_buf, &outlen, &buf[2], &inlen) || outlen) {
+ av_log(avctx, AV_LOG_ERROR, "error during lzo decompression\n");
+ return AVERROR_INVALIDDATA;
}
- case 1: { // zlib compression
+ break;
+ }
+ case 1: { // zlib compression
#if CONFIG_ZLIB
- unsigned long dlen = c->decomp_size;
- if (uncompress(c->decomp_buf, &dlen, &buf[2], buf_size - 2) != Z_OK) {
- av_log(avctx, AV_LOG_ERROR, "error during zlib decompression\n");
- return AVERROR_INVALIDDATA;
- }
- break;
+ unsigned long dlen = c->decomp_size;
+ if (uncompress(c->decomp_buf, &dlen, &buf[2], buf_size - 2) != Z_OK) {
+ av_log(avctx, AV_LOG_ERROR, "error during zlib decompression\n");
+ return AVERROR_INVALIDDATA;
+ }
+ break;
#else
- av_log(avctx, AV_LOG_ERROR, "compiled without zlib support\n");
- return AVERROR(ENOSYS);
+ av_log(avctx, AV_LOG_ERROR, "compiled without zlib support\n");
+ return AVERROR(ENOSYS);
#endif
- }
- default:
- av_log(avctx, AV_LOG_ERROR, "unknown compression\n");
- return AVERROR_INVALIDDATA;
+ }
+ default:
+ av_log(avctx, AV_LOG_ERROR, "unknown compression\n");
+ return AVERROR_INVALIDDATA;
}
// flip upside down, add difference frame
@@ -125,18 +128,19 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
return buf_size;
}
-static av_cold int decode_init(AVCodecContext *avctx) {
+static av_cold int decode_init(AVCodecContext *avctx)
+{
CamStudioContext *c = avctx->priv_data;
int stride;
switch (avctx->bits_per_coded_sample) {
- case 16: avctx->pix_fmt = AV_PIX_FMT_RGB555LE; break;
- case 24: avctx->pix_fmt = AV_PIX_FMT_BGR24; break;
- case 32: avctx->pix_fmt = AV_PIX_FMT_BGR0; break;
- default:
- av_log(avctx, AV_LOG_ERROR,
- "CamStudio codec error: invalid depth %i bpp\n",
- avctx->bits_per_coded_sample);
- return AVERROR_INVALIDDATA;
+ case 16: avctx->pix_fmt = AV_PIX_FMT_RGB555LE; break;
+ case 24: avctx->pix_fmt = AV_PIX_FMT_BGR24; break;
+ case 32: avctx->pix_fmt = AV_PIX_FMT_BGR0; break;
+ default:
+ av_log(avctx, AV_LOG_ERROR,
+ "CamStudio codec error: invalid depth %i bpp\n",
+ avctx->bits_per_coded_sample);
+ return AVERROR_INVALIDDATA;
}
c->bpp = avctx->bits_per_coded_sample;
c->linelen = avctx->width * avctx->bits_per_coded_sample / 8;
@@ -154,7 +158,8 @@ static av_cold int decode_init(AVCodecContext *avctx) {
return 0;
}
-static av_cold int decode_end(AVCodecContext *avctx) {
+static av_cold int decode_end(AVCodecContext *avctx)
+{
CamStudioContext *c = avctx->priv_data;
av_freep(&c->decomp_buf);
av_frame_free(&c->pic);