[Ffmpeg-cvslog] r8600 - trunk/libavcodec/rle.c
michael
subversion
Tue Apr 3 03:23:37 CEST 2007
Author: michael
Date: Tue Apr 3 03:23:37 2007
New Revision: 8600
Modified:
trunk/libavcodec/rle.c
Log:
fix indention (less work to fix it myself than to check if a indention fix patch is ok ...)
Modified: trunk/libavcodec/rle.c
==============================================================================
--- trunk/libavcodec/rle.c (original)
+++ trunk/libavcodec/rle.c Tue Apr 3 03:23:37 2007
@@ -62,22 +62,21 @@ int ff_rle_encode(uint8_t *outbuf, int o
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;
More information about the ffmpeg-cvslog
mailing list