[FFmpeg-cvslog] r18908 - trunk/libavcodec/qtrleenc.c

[bcoudurier]

Author: bcoudurier
Date: Sat May 23 07:55:29 2009
New Revision: 18908

Log:
fix qtrle encoding when previous frame linesize differs, fix #998

Modified:
   trunk/libavcodec/qtrleenc.c

Modified: trunk/libavcodec/qtrleenc.c
==============================================================================
--- trunk/libavcodec/qtrleenc.c	Sat May 23 06:07:25 2009	(r18907)
+++ trunk/libavcodec/qtrleenc.c	Sat May 23 07:55:29 2009	(r18908)
@@ -126,8 +126,10 @@ static void qtrle_encode_line(QtrleEncCo
     int temp_cost;
     int j;
 
-    uint8_t *this_line = p->               data[0] + line*p->linesize[0] + (width - 1)*s->pixel_size;
-    uint8_t *prev_line = s->previous_frame.data[0] + line*p->linesize[0] + (width - 1)*s->pixel_size;
+    uint8_t *this_line = p->               data[0] + line*p->               linesize[0] +
+        (width - 1)*s->pixel_size;
+    uint8_t *prev_line = s->previous_frame.data[0] + line*s->previous_frame.linesize[0] +
+        (width - 1)*s->pixel_size;
 
     s->length_table[width] = 0;
     skipcount = 0;
@@ -239,16 +241,17 @@ static int encode_frame(QtrleEncContext 
     uint8_t *orig_buf = buf;
 
     if (!s->frame.key_frame) {
+        unsigned line_size = s->avctx->width * s->pixel_size;
         for (start_line = 0; start_line < s->avctx->height; start_line++)
             if (memcmp(p->data[0] + start_line*p->linesize[0],
-                       s->previous_frame.data[0] + start_line*p->linesize[0],
-                       p->linesize[0]))
+                       s->previous_frame.data[0] + start_line*s->previous_frame.linesize[0],
+                       line_size))
                 break;
 
         for (end_line=s->avctx->height; end_line > start_line; end_line--)
             if (memcmp(p->data[0] + (end_line - 1)*p->linesize[0],
-                       s->previous_frame.data[0] + (end_line - 1)*p->linesize[0],
-                       p->linesize[0]))
+                       s->previous_frame.data[0] + (end_line - 1)*s->previous_frame.linesize[0],
+                       line_size))
                 break;
     }