set the previous tag size correctly in flv files

[ffmpeg] / libavcodec / rle.c

diff --git a/libavcodec/rle.c b/libavcodec/rle.c
index 6e6be0e5bd18cfb043d8e43543178180504f6044..2fb0d0e4862f6452af0c556e80d6fac69806affc 100644 (file)
--- a/libavcodec/rle.c
+++ b/libavcodec/rle.c
@@ -17,7 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
  */
 #include "avcodec.h"
 #include "rle.h"
@@ -55,29 +54,27 @@ static int count_pixels(const uint8_t *start, int len, int bpp, int same)
     return count;
 }
 
-int ff_rle_encode(uint8_t *outbuf, int out_size, const uint8_t *ptr , int bpp, int w, int8_t add, uint8_t xor)
+int ff_rle_encode(uint8_t *outbuf, int out_size, const uint8_t *ptr , int bpp, int w,
+                  int add_rep, int xor_rep, int add_raw, int xor_raw)
 {
     int count, x;
-    uint8_t *out;
-
-    out = outbuf;
-
+    uint8_t *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_rep) + add_rep;
+            memcpy(out, ptr, bpp);
+            out += bpp;
+        } else {
+            /* fall back on uncompressed */
+            count = count_pixels(ptr, w-x, bpp, 0);
+            *out++ = (count ^ xor_raw) + add_raw;
 
-                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;