Commit 5628b9f5 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit 'ab7c6462'

* commit 'ab7c6462':
  sgi: remove redundant argument from read_uncompressed_sgi()

Conflicts:
	libavcodec/sgidec.c

See: 0f656935Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 5b03caf9 ab7c6462
...@@ -122,8 +122,7 @@ static int read_rle_sgi(uint8_t *out_buf, SgiState *s) ...@@ -122,8 +122,7 @@ 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, static int read_uncompressed_sgi(unsigned char *out_buf, SgiState *s)
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;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment