diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-01 05:29:29 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-01 05:29:29 +0400 |
| commit | be4ae3f532d13deb0916f950d3bbc60c0f04fd85 (patch) | |
| tree | bfd1dc46f68684bc92d3a6c2af93f5ee6307c044 /libavcodec/sgienc.c | |
| parent | 0054bbd6648318a2b1e6dd66adb38f5d3acb922d (diff) | |
| parent | a7dbfcf6cb6ab8a8981d74332fd02fb90360d22f (diff) | |
Merge commit 'a7dbfcf6cb6ab8a8981d74332fd02fb90360d22f'
* commit 'a7dbfcf6cb6ab8a8981d74332fd02fb90360d22f':
sgi: K&R formatting cosmetics
Conflicts:
libavcodec/sgidec.c
libavcodec/sgienc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/sgienc.c')
| -rw-r--r-- | libavcodec/sgienc.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/libavcodec/sgienc.c b/libavcodec/sgienc.c index 0e4f304a23..c22535421c 100644 --- a/libavcodec/sgienc.c +++ b/libavcodec/sgienc.c @@ -132,14 +132,14 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt, memset(buf, 0, SGI_HEADER_SIZE); buf += 80; - /* colormap */ + /* colormap */ bytestream_put_be32(&buf, 0L); /* The rest of the 512 byte header is unused. */ buf += 404; offsettab = buf; - if (avctx->coder_type != FF_CODER_TYPE_RAW) { + if (avctx->coder_type != FF_CODER_TYPE_RAW) { /* Skip RLE offset table. */ buf += tablesize; lengthtab = buf; @@ -195,7 +195,7 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt, } /* total length */ - pkt->size = buf - pkt->data; + pkt->size = buf - pkt->data; pkt->flags |= AV_PKT_FLAG_KEY; *got_packet = 1; @@ -209,14 +209,14 @@ static av_cold int encode_close(AVCodecContext *avctx) } AVCodec ff_sgi_encoder = { - .name = "sgi", - .long_name = NULL_IF_CONFIG_SMALL("SGI image"), - .type = AVMEDIA_TYPE_VIDEO, - .id = AV_CODEC_ID_SGI, - .init = encode_init, - .encode2 = encode_frame, - .close = encode_close, - .pix_fmts = (const enum AVPixelFormat[]){ + .name = "sgi", + .long_name = NULL_IF_CONFIG_SMALL("SGI image"), + .type = AVMEDIA_TYPE_VIDEO, + .id = AV_CODEC_ID_SGI, + .init = encode_init, + .encode2 = encode_frame, + .close = encode_close, + .pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_RGB24, AV_PIX_FMT_RGBA, AV_PIX_FMT_RGB48LE, AV_PIX_FMT_RGB48BE, AV_PIX_FMT_RGBA64LE, AV_PIX_FMT_RGBA64BE, |