aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorPaul B Mahol <onemda@gmail.com>2012-07-08 23:28:16 +0000
committerVittorio Giovara <vittorio.giovara@gmail.com>2014-04-01 01:19:03 +0200
commitab7c64624a1254d509b71c2a4945336567e93845 (patch)
treeb0cf32cfeef5031a3667158b07ecce78df266fc8 /libavcodec
parent6d9ccee4519f41155c88655c77bfb1ef085797fd (diff)
downloadffmpeg-ab7c64624a1254d509b71c2a4945336567e93845.tar.gz
sgi: remove redundant argument from read_uncompressed_sgi()
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/sgidec.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/libavcodec/sgidec.c b/libavcodec/sgidec.c
index 7c751f6adc..04cfcd0353 100644
--- a/libavcodec/sgidec.c
+++ b/libavcodec/sgidec.c
@@ -118,16 +118,15 @@ static int read_rle_sgi(uint8_t *out_buf, SgiState *s)
/**
* Read an uncompressed SGI image.
* @param out_buf output buffer
- * @param out_end end ofoutput buffer
* @param s the current image state
* @return 0 if read success, otherwise return -1.
*/
-static int read_uncompressed_sgi(unsigned char *out_buf, uint8_t *out_end,
- 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;
GetByteContext gp[4];
+ uint8_t *out_end;
/* Test buffer size. */
if (offset * s->depth > bytestream2_get_bytes_left(&s->g))
@@ -228,7 +227,7 @@ static int decode_frame(AVCodecContext *avctx,
if (rle) {
ret = read_rle_sgi(out_end, s);
} else {
- ret = read_uncompressed_sgi(out_buf, out_end, s);
+ ret = read_uncompressed_sgi(out_buf, s);
}
if (ret == 0) {