remove impossible condition from msrle_decode_pal4()

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

remove impossible condition from msrle_decode_pal4()
Originally committed as revision 25631 to svn://svn.ffmpeg.org/ffmpeg/trunk
81a64614 · Michael Niedermayer · 94ee6c10 · 81a64614
Commit 81a64614 authored Nov 02, 2010 by Michael Niedermayer
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 4 deletions

msrledec.c libavcodec/msrledec.c +2 -4

No files found.
--- 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) ||
+                if (row_ptr + pixel_ptr + stream_byte > frame_size) {
-                    (row_ptr < 0)) {
                    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) ||
+            if (row_ptr + pixel_ptr + stream_byte > frame_size) {
-                (row_ptr < 0)) {
                av_log(avctx, AV_LOG_ERROR, " MS RLE: frame ptr just went out of bounds (1)\n");
                return -1;
            }