Merge commit '6d9ccee4'

* commit '6d9ccee4':
  sgi: set the row boundary to the correct value

Conflicts:
	libavcodec/sgidec.c

See: 39c56ef9Merged-by: Michael Niedermayer <michaelni@gmx.at>

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;
             }