[SCM] libav/experimental: sgi: remove redundant argument from read_uncompressed_sgi()
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Aug 10 16:02:33 UTC 2014
The following commit has been merged in the experimental branch:
commit ab7c64624a1254d509b71c2a4945336567e93845
Author: Paul B Mahol <onemda at gmail.com>
Date: Sun Jul 8 23:28:16 2012 +0000
sgi: remove redundant argument from read_uncompressed_sgi()
diff --git a/libavcodec/sgidec.c b/libavcodec/sgidec.c
index 7c751f6..04cfcd0 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) {
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list