From eb24fd64589b7eea91fa752861f0c6f07e5a48a8 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Tue, 3 Apr 2007 01:23:37 +0000 Subject: fix indention (less work to fix it myself than to check if a indention fix patch is ok ...) Originally committed as revision 8600 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/rle.c | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) (limited to 'libavcodec/rle.c') diff --git a/libavcodec/rle.c b/libavcodec/rle.c index 6e6be0e5bd..b3d09fb53a 100644 --- a/libavcodec/rle.c +++ b/libavcodec/rle.c @@ -62,22 +62,21 @@ int ff_rle_encode(uint8_t *outbuf, int out_size, const uint8_t *ptr , int bpp, i out = outbuf; + for(x = 0; x < w; x += count) { + /* see if we can encode the next set of pixels with RLE */ + if((count = count_pixels(ptr, w-x, bpp, 1)) > 1) { + if(out + bpp + 1 > outbuf + out_size) return -1; + *out++ = (count ^ xor) + add; + memcpy(out, ptr, bpp); + out += bpp; + } else { + /* fall back on uncompressed */ + count = count_pixels(ptr, w-x, bpp, 0); + *out++ = count - 1; - for(x = 0; x < w; x += count) { - /* see if we can encode the next set of pixels with RLE */ - if((count = count_pixels(ptr, w-x, bpp, 1)) > 1) { - if(out + bpp + 1 > outbuf + out_size) return -1; - *out++ = (count ^ xor) + add; - memcpy(out, ptr, bpp); - out += bpp; - } else { - /* fall back on uncompressed */ - count = count_pixels(ptr, w-x, bpp, 0); - *out++ = count - 1; - - if(out + bpp*count > outbuf + out_size) return -1; - memcpy(out, ptr, bpp * count); - out += bpp * count; + if(out + bpp*count > outbuf + out_size) return -1; + memcpy(out, ptr, bpp * count); + out += bpp * count; } ptr += count * bpp; -- cgit v1.2.3