[FFmpeg-cvslog] r18965 - trunk/libavcodec/msrledec.c

bcoudurier subversion
Wed May 27 08:43:51 CEST 2009


Author: bcoudurier
Date: Wed May 27 08:43:51 2009
New Revision: 18965

Log:
do not print false error if eof follows eol

Modified:
   trunk/libavcodec/msrledec.c

Modified: trunk/libavcodec/msrledec.c
==============================================================================
--- trunk/libavcodec/msrledec.c	Wed May 27 03:29:55 2009	(r18964)
+++ trunk/libavcodec/msrledec.c	Wed May 27 08:43:51 2009	(r18965)
@@ -146,7 +146,7 @@ static int msrle_decode_8_16_24_32(AVCod
             p2 = *src++;
             if(p2 == 0) { //End-of-line
                 output = pic->data[0] + (--line) * pic->linesize[0];
-                if (line < 0){
+                if (line < 0 && !(src+1 < data + srcsize && AV_RB16(src) == 1)) {
                     av_log(avctx, AV_LOG_ERROR, "Next line is beyond picture bounds\n");
                     return -1;
                 }



More information about the ffmpeg-cvslog mailing list