diff options
| author | Paul B Mahol <onemda@gmail.com> | 2012-07-08 23:28:16 +0000 |
|---|---|---|
| committer | Paul B Mahol <onemda@gmail.com> | 2012-07-08 23:40:55 +0000 |
| commit | 0f65693529decc470e3f01cb950b1864ea982c06 (patch) | |
| tree | ef6d31224a0df07e602f29aac738b8d9ef2b86fe /libavcodec/sgidec.c | |
| parent | 60351ec13c6d77bb5558d2d6706f9e3586af949b (diff) | |
| download | android_external_ffmpeg-0f65693529decc470e3f01cb950b1864ea982c06.tar.gz android_external_ffmpeg-0f65693529decc470e3f01cb950b1864ea982c06.tar.bz2 android_external_ffmpeg-0f65693529decc470e3f01cb950b1864ea982c06.zip | |
sgidec: remove redundant argument from read_uncompressed_sgi()
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Diffstat (limited to 'libavcodec/sgidec.c')
| -rw-r--r-- | libavcodec/sgidec.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/libavcodec/sgidec.c b/libavcodec/sgidec.c index f11efd05ee..ee09d69c63 100644 --- a/libavcodec/sgidec.c +++ b/libavcodec/sgidec.c @@ -113,16 +113,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) { |