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

[michael]

Author: michael
Date: Tue Nov  2 02:19:09 2010
New Revision: 25631

Log:
remove impossible condition from msrle_decode_pal4()

Modified:
   trunk/libavcodec/msrledec.c

Modified: trunk/libavcodec/msrledec.c
==============================================================================
--- trunk/libavcodec/msrledec.c	Tue Nov  2 02:19:03 2010	(r25630)
+++ trunk/libavcodec/msrledec.c	Tue Nov  2 02:19:09 2010	(r25631)
@@ -75,8 +75,7 @@ static int msrle_decode_pal4(AVCodecCont
                 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(AVCodecCont
             }
         } 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;
             }