[SCM] libav/experimental: 10l trocadero: forgot one case where picture linesize should be used

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 16:56:24 UTC 2013


The following commit has been merged in the experimental branch:
commit e09cdc7206392ae4530382b1a1807669f2d8e22f
Author: Kostya Shishkov <kostya.shishkov at gmail.com>
Date:   Sun Dec 27 08:56:06 2009 +0000

    10l trocadero: forgot one case where picture linesize should be used
    
    Originally committed as revision 20932 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/interplayvideo.c b/libavcodec/interplayvideo.c
index 99685ff..974aad2 100644
--- a/libavcodec/interplayvideo.c
+++ b/libavcodec/interplayvideo.c
@@ -589,7 +589,7 @@ static void ipvideo_decode_opcodes(IpvideoContext *s)
         s->stride = s->current_frame.linesize[0] >> 1;
     }
     s->line_inc = s->stride - 8;
-    s->upper_motion_limit_offset = (s->avctx->height - 8) * s->stride
+    s->upper_motion_limit_offset = (s->avctx->height - 8) * s->current_frame.linesize[0]
                                   + (s->avctx->width - 8) * (1 + s->is_16bpp);
 
     init_get_bits(&gb, s->decoding_map, s->decoding_map_size * 8);

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list