har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit 'a7dbfcf6cb6ab8a8981d74332fd02fb90360d22f'

Browse Source 
* commit 'a7dbfcf6cb6ab8a8981d74332fd02fb90360d22f':
  sgi: K&R formatting cosmetics

Conflicts:
	libavcodec/sgidec.c
	libavcodec/sgienc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-04-01 03:29:29 +02:00
commit be4ae3f532
3 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/sgi.h
View File

@ -1,4 +1,4 @@
/* /*
* SGI image encoder * SGI image encoder
* Xiaohui Sun <tjnksxh@hotmail.com> * Xiaohui Sun <tjnksxh@hotmail.com>
* *

3
libavcodec/sgidec.c
View File

@ -122,7 +122,8 @@ static int read_rle_sgi(uint8_t *out_buf, SgiState *s)
* @param s the current image state * @param s the current image state
* @return 0 if read success, else return error code. * @return 0 if read success, else return error code.
*/ */
static int read_uncompressed_sgi(unsigned char* out_buf, SgiState *s) static int read_uncompressed_sgi(unsigned char *out_buf,
SgiState *s)
{ {
int x, y, z; int x, y, z;
unsigned int offset = s->height * s->width * s->bytes_per_channel; unsigned int offset = s->height * s->width * s->bytes_per_channel;

2
libavcodec/sgienc.c
View File

@ -216,7 +216,7 @@ AVCodec ff_sgi_encoder = {
.init = encode_init, .init = encode_init,
.encode2 = encode_frame, .encode2 = encode_frame,
.close = encode_close, .close = encode_close,
.pix_fmts = (const enum AVPixelFormat[]){ .pix_fmts = (const enum AVPixelFormat[]) {
AV_PIX_FMT_RGB24, AV_PIX_FMT_RGBA, AV_PIX_FMT_RGB24, AV_PIX_FMT_RGBA,
AV_PIX_FMT_RGB48LE, AV_PIX_FMT_RGB48BE, AV_PIX_FMT_RGB48LE, AV_PIX_FMT_RGB48BE,
AV_PIX_FMT_RGBA64LE, AV_PIX_FMT_RGBA64BE, AV_PIX_FMT_RGBA64LE, AV_PIX_FMT_RGBA64BE,