diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-01 03:51:32 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-01 03:51:52 +0200 |
| commit | 5b03caf9491d3f4a1ddbb5e1c9e7e619c4390af5 (patch) | |
| tree | fcd3b2bd03761e4de6b971ecb7f19d2f25d87a11 /libavcodec/sgidec.c | |
| parent | 013aa222c624c62fd61eb033803bc297b6681ea0 (diff) | |
| parent | 6d9ccee4519f41155c88655c77bfb1ef085797fd (diff) | |
| download | ffmpeg-5b03caf9491d3f4a1ddbb5e1c9e7e619c4390af5.tar.gz | |
Merge commit '6d9ccee4519f41155c88655c77bfb1ef085797fd'
* commit '6d9ccee4519f41155c88655c77bfb1ef085797fd':
sgi: set the row boundary to the correct value
Conflicts:
libavcodec/sgidec.c
See: 39c56ef9216c508a2c19cef93600e6590b4595cd
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/sgidec.c')
| -rw-r--r-- | libavcodec/sgidec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/sgidec.c b/libavcodec/sgidec.c index 9bad0e3fcd..b883469f6c 100644 --- a/libavcodec/sgidec.c +++ b/libavcodec/sgidec.c @@ -107,7 +107,7 @@ static int read_rle_sgi(uint8_t *out_buf, SgiState *s) dest_row -= s->linesize; start_offset = bytestream2_get_be32(&g_table); bytestream2_seek(&s->g, start_offset, SEEK_SET); - if (expand_rle_row(s, dest_row + z, s->width*s->depth, + if (expand_rle_row(s, dest_row + z, s->width * s->depth, s->depth) != s->width) { return AVERROR_INVALIDDATA; } |