diff options
author | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2009-05-27 06:43:51 +0000 |
---|---|---|
committer | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2009-05-27 06:43:51 +0000 |
commit | 25178da3020bdbf6cb69de55e308e8fae6fc2e5c (patch) | |
tree | 04706a357e9dec65a1336749c11cc32b72f8fadb | |
parent | 6c7c2f7bb3cdb3b1484bff00572c905f63965fc2 (diff) | |
download | ffmpeg-25178da3020bdbf6cb69de55e308e8fae6fc2e5c.tar.gz |
do not print false error if eof follows eol
Originally committed as revision 18965 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r-- | libavcodec/msrledec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/msrledec.c b/libavcodec/msrledec.c index c0c09f3e2f..7f9adcdce6 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; } |