diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2007-04-03 01:23:37 +0000 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2007-04-03 01:23:37 +0000 |
commit | eb24fd64589b7eea91fa752861f0c6f07e5a48a8 (patch) | |
tree | f3312f6aee6f8bb4b3de65c8e582af042381f76c /libavcodec/rle.c | |
parent | bee3851598e806ce535988a04c8ff2a8a00736e6 (diff) | |
download | ffmpeg-eb24fd64589b7eea91fa752861f0c6f07e5a48a8.tar.gz |
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
Diffstat (limited to 'libavcodec/rle.c')
-rw-r--r-- | libavcodec/rle.c | 29 |
1 files changed, 14 insertions, 15 deletions
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; |