From b08de903cd96ff1d2f1b74c0e47c116f26561661 Mon Sep 17 00:00:00 2001 From: Kostya Shishkov Date: Thu, 1 Oct 2009 05:42:55 +0000 Subject: [PATCH] Make MS RLE decoder produce both bottom-up and top-down pictures Originally committed as revision 20111 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/msrledec.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libavcodec/msrledec.c b/libavcodec/msrledec.c index 7f9adcd..b8f5e62 100644 --- a/libavcodec/msrledec.c +++ b/libavcodec/msrledec.c @@ -167,7 +167,8 @@ static int msrle_decode_8_16_24_32(AVCodecContext *avctx, AVPicture *pic, int de continue; } // Copy data - if (output + p2 * (depth >> 3) > output_end) { + if ((pic->linesize[0] > 0 && output + p2 * (depth >> 3) > output_end) + ||(pic->linesize[0] < 0 && output + p2 * (depth >> 3) < output_end)) { src += p2 * (depth >> 3); continue; } @@ -211,7 +212,8 @@ static int msrle_decode_8_16_24_32(AVCodecContext *avctx, AVPicture *pic, int de src += 4; break; } - if (output + p1 * (depth >> 3) > output_end) + if ((pic->linesize[0] > 0 && output + p1 * (depth >> 3) > output_end) + ||(pic->linesize[0] < 0 && output + p1 * (depth >> 3) < output_end)) continue; for(i = 0; i < p1; i++) { switch(depth){ -- 2.7.4