[SCM] libav/experimental: remove impossible condition from msrle_decode_pal4()

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 81a646140f80c3e15c1e68883a5ecfb9b2bc8a6a
Author: Michael Niedermayer <michaelni at gmx.at>
Date:   Tue Nov 2 01:19:09 2010 +0000

    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;
             }

-- 
Libav/FFmpeg packaging