[SCM] libav/experimental: mmvideo: remove some conditional statements by limiting range of half_horiz and half_vert parameters to [0, 1]

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 091bc6ca8c643bfece2c70ff2404c7b31574e1f1
Author: Peter Ross <pross at xvid.org>
Date:   Mon Jan 10 12:16:33 2011 +0000

    mmvideo: remove some conditional statements by limiting range of half_horiz and half_vert parameters to [0,1]
    
    Originally committed as revision 26299 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/mmvideo.c b/libavcodec/mmvideo.c
index 6dbc0c4..0b20ab4 100644
--- a/libavcodec/mmvideo.c
+++ b/libavcodec/mmvideo.c
@@ -78,6 +78,10 @@ static void mm_decode_pal(MmContext *s, const uint8_t *buf, const uint8_t *buf_e
     }
 }
 
+/**
+ * @param half_horiz Half horizontal resolution (0 or 1)
+ * @param half_vert Half vertical resolution (0 or 1)
+ */
 static void mm_decode_intra(MmContext * s, int half_horiz, int half_vert, const uint8_t *buf, int buf_size)
 {
     int i, x, y;
@@ -108,11 +112,15 @@ static void mm_decode_intra(MmContext * s, int half_horiz, int half_vert, const
 
         if (x >= s->avctx->width) {
             x=0;
-            y += half_vert ? 2 : 1;
+            y += 1 + half_vert;
         }
     }
 }
 
+/*
+ * @param half_horiz Half horizontal resolution (0 or 1)
+ * @param half_vert Half vertical resolution (0 or 1)
+ */
 static void mm_decode_inter(MmContext * s, int half_horiz, int half_vert, const uint8_t *buf, int buf_size)
 {
     const int data_ptr = 2 + AV_RL16(&buf[0]);
@@ -145,12 +153,12 @@ static void mm_decode_inter(MmContext * s, int half_horiz, int half_vert, const
                     }
                     d++;
                 }
-                x += half_horiz ? 2 : 1;
+                x += 1 + half_horiz;
             }
         }
 
         r += length;
-        y += half_vert ? 2 : 1;
+        y += 1 + half_vert;
     }
 }
 

-- 
Libav/FFmpeg packaging