Commit 25178da3 authored by Baptiste Coudurier's avatar Baptiste Coudurier

do not print false error if eof follows eol

Originally committed as revision 18965 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 6c7c2f7b
...@@ -146,7 +146,7 @@ static int msrle_decode_8_16_24_32(AVCodecContext *avctx, AVPicture *pic, int de ...@@ -146,7 +146,7 @@ static int msrle_decode_8_16_24_32(AVCodecContext *avctx, AVPicture *pic, int de
p2 = *src++; p2 = *src++;
if(p2 == 0) { //End-of-line if(p2 == 0) { //End-of-line
output = pic->data[0] + (--line) * pic->linesize[0]; 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"); av_log(avctx, AV_LOG_ERROR, "Next line is beyond picture bounds\n");
return -1; return -1;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment