[SCM] libav/experimental: fix indention (less work to fix it myself than to check if a indention fix patch is ok ...)

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 15:58:28 UTC 2013


The following commit has been merged in the experimental branch:
commit eb24fd64589b7eea91fa752861f0c6f07e5a48a8
Author: Michael Niedermayer <michaelni at gmx.at>
Date:   Tue Apr 3 01:23:37 2007 +0000

    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

diff --git a/libavcodec/rle.c b/libavcodec/rle.c
index 6e6be0e..b3d09fb 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;

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list