diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-01 03:55:45 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-01 03:55:45 +0200 |
| commit | 5628b9f5fb92a72fa35a46520cf6c4dc1942de25 (patch) | |
| tree | 047513d7fd38a7a53db2b302ed9499346cff45d0 /libavcodec/sgidec.c | |
| parent | 5b03caf9491d3f4a1ddbb5e1c9e7e619c4390af5 (diff) | |
| parent | ab7c64624a1254d509b71c2a4945336567e93845 (diff) | |
| download | ffmpeg-5628b9f5fb92a72fa35a46520cf6c4dc1942de25.tar.gz | |
Merge commit 'ab7c64624a1254d509b71c2a4945336567e93845'
* commit 'ab7c64624a1254d509b71c2a4945336567e93845':
sgi: remove redundant argument from read_uncompressed_sgi()
Conflicts:
libavcodec/sgidec.c
See: 0f65693529decc470e3f01cb950b1864ea982c06
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/sgidec.c')
| -rw-r--r-- | libavcodec/sgidec.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libavcodec/sgidec.c b/libavcodec/sgidec.c index b883469f6c..b29a5dd20d 100644 --- a/libavcodec/sgidec.c +++ b/libavcodec/sgidec.c @@ -122,8 +122,7 @@ static int read_rle_sgi(uint8_t *out_buf, SgiState *s) * @param s the current image state * @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; unsigned int offset = s->height * s->width * s->bytes_per_channel; |