change

for(){
    if(){
        switch(){

to
switch(){
    for(){
        if(){

this halfs the number of times the switch is executed in bidir blocks, in 
other blocks the number is the same


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@9860 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b

libavcodec/mpeg12.c

@@ -375,12 +375,12 @@ static int mpeg_decode_mb(MpegEncContext *s,
 
             /* motion vectors */
             s->mv_dir = 0;
-            for(i=0;i<2;i++) {
-                if (USES_LIST(mb_type, i)) {
-                    s->mv_dir |= (MV_DIR_FORWARD >> i);
             dprintf(s->avctx, "motion_type=%d\n", motion_type);
             switch(motion_type) {
             case MT_FRAME: /* or MT_16X8 */
+                for(i=0;i<2;i++) {
+                    if (USES_LIST(mb_type, i)) {
+                        s->mv_dir |= (MV_DIR_FORWARD >> i);
                         if (s->picture_structure == PICT_FRAME) {
                             /* MT_FRAME */
                             mb_type |= MB_TYPE_16x16;
@@ -408,9 +408,14 @@ static int mpeg_decode_mb(MpegEncContext *s,
                                 }
                             }
                         }
+                    }
+                }
                 break;
             case MT_FIELD:
                 s->mv_type = MV_TYPE_FIELD;
+                for(i=0;i<2;i++) {
+                    if (USES_LIST(mb_type, i)) {
+                        s->mv_dir |= (MV_DIR_FORWARD >> i);
                         if (s->picture_structure == PICT_FRAME) {
                             mb_type |= MB_TYPE_16x8 | MB_TYPE_INTERLACED;
                             for(j=0;j<2;j++) {
@@ -437,11 +442,15 @@ static int mpeg_decode_mb(MpegEncContext *s,
                                 s->mv[i][0][k] = val;
                             }
                         }
+                    }
+                }
                 break;
             case MT_DMV:
-                        {
+                s->mv_type = MV_TYPE_DMV;
+                for(i=0;i<2;i++) {
+                    if (USES_LIST(mb_type, i)) {
                         int dmx, dmy, mx, my, m;
-
+                        s->mv_dir |= (MV_DIR_FORWARD >> i);
                         mx = mpeg_decode_motion(s, s->mpeg_f_code[i][0],
                                                 s->last_mv[i][0][0]);
                         s->last_mv[i][0][0] = mx;
@@ -450,7 +459,6 @@ static int mpeg_decode_mb(MpegEncContext *s,
                         my = mpeg_decode_motion(s, s->mpeg_f_code[i][1],
                                                 s->last_mv[i][0][1] >> 1);
                         dmy = get_dmv(s);
-                            s->mv_type = MV_TYPE_DMV;
 
 
                         s->last_mv[i][0][1] = my<<1;
@@ -484,14 +492,13 @@ static int mpeg_decode_mb(MpegEncContext *s,
                                 s->mv[i][2][1]++;
                         }
                     }
+                }
                 break;
             default:
                 av_log(s->avctx, AV_LOG_ERROR, "00 motion_type at %d %d\n", s->mb_x, s->mb_y);
                 return -1;
             }
         }
-            }
-        }
 
         s->mb_intra = 0;
         if (HAS_CBP(mb_type)) {