[SCM] libav/experimental: do not print false error if eof follows eol

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 25178da3020bdbf6cb69de55e308e8fae6fc2e5c
Author: Baptiste Coudurier <baptiste.coudurier at gmail.com>
Date:   Wed May 27 06:43:51 2009 +0000

    do not print false error if eof follows eol
    
    Originally committed as revision 18965 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/msrledec.c b/libavcodec/msrledec.c
index c0c09f3..7f9adcd 100644
--- a/libavcodec/msrledec.c
+++ b/libavcodec/msrledec.c
@@ -146,7 +146,7 @@ static int msrle_decode_8_16_24_32(AVCodecContext *avctx, AVPicture *pic, int de
             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;
                 }

-- 
Libav/FFmpeg packaging