[FFmpeg-cvslog] r20929 - trunk/libavcodec/interplayvideo.c

[kostya]

Author: kostya
Date: Sun Dec 27 09:38:07 2009
New Revision: 20929

Log:
Use frame linesize in Interplay Video block copying function

Modified:
   trunk/libavcodec/interplayvideo.c

Modified: trunk/libavcodec/interplayvideo.c
==============================================================================
--- trunk/libavcodec/interplayvideo.c	Sun Dec 27 09:31:39 2009	(r20928)
+++ trunk/libavcodec/interplayvideo.c	Sun Dec 27 09:38:07 2009	(r20929)
@@ -87,7 +87,7 @@ typedef struct IpvideoContext {
 static int copy_from(IpvideoContext *s, AVFrame *src, int delta_x, int delta_y)
 {
     int current_offset = s->pixel_ptr - s->current_frame.data[0];
-    int motion_offset = current_offset + delta_y * s->stride + delta_x;
+    int motion_offset = current_offset + delta_y * s->current_frame.linesize[0] + delta_x;
     if (motion_offset < 0) {
         av_log(s->avctx, AV_LOG_ERROR, " Interplay video: motion offset < 0 (%d)\n", motion_offset);
         return -1;
@@ -96,7 +96,7 @@ static int copy_from(IpvideoContext *s, 
             motion_offset, s->upper_motion_limit_offset);
         return -1;
     }
-    s->dsp.put_pixels_tab[1][0](s->pixel_ptr, src->data[0] + motion_offset, s->stride, 8);
+    s->dsp.put_pixels_tab[1][0](s->pixel_ptr, src->data[0] + motion_offset, s->current_frame.linesize[0], 8);
     return 0;
 }