changeset 10714:5c36c4772cf8 libavcodec

Use frame linesize in Interplay Video block copying function
author kostya
date Sun, 27 Dec 2009 08:38:07 +0000
parents b703476cd4df
children 4f455f478398
files interplayvideo.c
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/interplayvideo.c	Sun Dec 27 08:31:39 2009 +0000
+++ b/interplayvideo.c	Sun Dec 27 08:38:07 2009 +0000
@@ -87,7 +87,7 @@
 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 @@
             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;
 }