[FFmpeg-soc] [soc]: r868 - dirac/libavcodec/dirac.c

[marco]

Author: marco
Date: Thu Aug 16 15:55:35 2007
New Revision: 868

Log:
join if statements

Modified:
   dirac/libavcodec/dirac.c

Modified: dirac/libavcodec/dirac.c
==============================================================================
--- dirac/libavcodec/dirac.c	(original)
+++ dirac/libavcodec/dirac.c	Thu Aug 16 15:55:35 2007
@@ -1306,14 +1306,13 @@ static int motion_vector_prediction(Dira
         /* This is the only reference, return it.  */
         if (x == 0)
             return top;
-    }
-
-    if (x > 0 && y > 0) {
-        /* Test if the block above the current one has a motion vector
-           for this reference frame.  */
-        if ((s->blmotion[(y - 1) * s->blwidth + x - 1].use_ref & mask) == refmask) {
-            lefttop = s->blmotion[(y - 1) * s->blwidth + x - 1].vect[ref][dir];
-            cnt++;
+        else if (x > 0) {
+            /* Test if the block above the current one has a motion vector
+               for this reference frame.  */
+            if ((s->blmotion[(y - 1) * s->blwidth + x - 1].use_ref & mask) == refmask) {
+                lefttop = s->blmotion[(y - 1) * s->blwidth + x - 1].vect[ref][dir];
+                cnt++;
+            }
         }
     }