Make MS RLE decoder produce both bottom-up and top-down pictures
authorKostya Shishkov <kostya.shishkov@gmail.com>
Thu, 1 Oct 2009 05:42:55 +0000 (05:42 +0000)
committerKostya Shishkov <kostya.shishkov@gmail.com>
Thu, 1 Oct 2009 05:42:55 +0000 (05:42 +0000)
Originally committed as revision 20111 to svn://svn.ffmpeg.org/ffmpeg/trunk

libavcodec/msrledec.c

index 7f9adcd..b8f5e62 100644 (file)
@@ -167,7 +167,8 @@ static int msrle_decode_8_16_24_32(AVCodecContext *avctx, AVPicture *pic, int de
                 continue;
             }
             // Copy data
                 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;
             }
                 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;
             }
                      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){
                 continue;
             for(i = 0; i < p1; i++) {
                 switch(depth){