From: Michael Niedermayer <michaelni@gmx.at>
Date: Tue, 2 Nov 2010 01:19:09 +0000 (+0000)
Subject: remove impossible condition from msrle_decode_pal4()
X-Git-Tag: n0.7.1~1795
X-Git-Url: http://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff_plain/81a646140f80c3e15c1e68883a5ecfb9b2bc8a6a

remove impossible condition from msrle_decode_pal4()

Originally committed as revision 25631 to svn://svn.ffmpeg.org/ffmpeg/trunk
---

diff --git a/libavcodec/msrledec.c b/libavcodec/msrledec.c
index 2f27d20..d3d3601 100644
--- a/libavcodec/msrledec.c
+++ b/libavcodec/msrledec.c
@@ -75,8 +75,7 @@ static int msrle_decode_pal4(AVCodecContext *avctx, AVPicture *pic,
                 odd_pixel =  stream_byte & 1;
                 rle_code = (stream_byte + 1) / 2;
                 extra_byte = rle_code & 0x01;
-                if ((row_ptr + pixel_ptr + stream_byte > frame_size) ||
-                    (row_ptr < 0)) {
+                if (row_ptr + pixel_ptr + stream_byte > frame_size) {
                     av_log(avctx, AV_LOG_ERROR, " MS RLE: frame ptr just went out of bounds (1)\n");
                     return -1;
                 }
@@ -101,8 +100,7 @@ static int msrle_decode_pal4(AVCodecContext *avctx, AVPicture *pic,
             }
         } else {
             // decode a run of data
-            if ((row_ptr + pixel_ptr + stream_byte > frame_size) ||
-                (row_ptr < 0)) {
+            if (row_ptr + pixel_ptr + stream_byte > frame_size) {
                 av_log(avctx, AV_LOG_ERROR, " MS RLE: frame ptr just went out of bounds (1)\n");
                 return -1;
             }