[SCM] libav/experimental: 10l (field select readed at the wrong place ...)

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit e3bd83f87484cba07a0a68facfe21a95f709078a
Author: Michael Niedermayer <michaelni at gmx.at>
Date:   Fri Sep 13 11:47:57 2002 +0000

    10l (field select readed at the wrong place ...)
    
    Originally committed as revision 939 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/h263.c b/libavcodec/h263.c
index 947bb9f..e9c2b3f 100644
--- a/libavcodec/h263.c
+++ b/libavcodec/h263.c
@@ -2840,10 +2840,21 @@ int h263_decode_mb(MpegEncContext *s,
                 if(cbp)
                     s->interlaced_dct= get_bits1(&s->gb);
 
-                if(mb_type!=MB_TYPE_B_DIRECT && get_bits1(&s->gb))
+                if(mb_type!=MB_TYPE_B_DIRECT && get_bits1(&s->gb)){
                     field_mv=1;
+
+                    if(mb_type!=MB_TYPE_B_BACKW){
+                        s->field_select[0][0]= get_bits1(&s->gb);
+                        s->field_select[0][1]= get_bits1(&s->gb);
+                    }
+                    if(mb_type!=MB_TYPE_B_FORW){
+                        s->field_select[1][0]= get_bits1(&s->gb);
+                        s->field_select[1][1]= get_bits1(&s->gb);
+                    }
+                }
             }
 
+            s->mv_dir = 0;
             if(mb_type!=MB_TYPE_B_DIRECT && !field_mv){
                 s->mv_type= MV_TYPE_16X16;
                 if(mb_type!=MB_TYPE_B_BACKW){
@@ -2853,8 +2864,7 @@ int h263_decode_mb(MpegEncContext *s,
                     my = h263_decode_motion(s, s->last_mv[0][0][1], s->f_code);
                     s->last_mv[0][1][0]= s->last_mv[0][0][0]= s->mv[0][0][0] = mx;
                     s->last_mv[0][1][1]= s->last_mv[0][0][1]= s->mv[0][0][1] = my;
-                }else
-                    s->mv_dir = 0;
+                }
     
                 if(mb_type!=MB_TYPE_B_FORW){
                     s->mv_dir |= MV_DIR_BACKWARD;
@@ -2868,10 +2878,9 @@ int h263_decode_mb(MpegEncContext *s,
                     PRINT_MB_TYPE(mb_type==MB_TYPE_B_FORW ? "F" : (mb_type==MB_TYPE_B_BACKW ? "B" : "T"));
             }else if(mb_type!=MB_TYPE_B_DIRECT){
                 s->mv_type= MV_TYPE_FIELD;
+
                 if(mb_type!=MB_TYPE_B_BACKW){
                     s->mv_dir = MV_DIR_FORWARD;
-                    s->field_select[0][0]= get_bits1(&s->gb);
-                    s->field_select[0][1]= get_bits1(&s->gb);
                 
                     for(i=0; i<2; i++){
                         mx = h263_decode_motion(s, s->last_mv[0][i][0]  , s->f_code);
@@ -2879,13 +2888,10 @@ int h263_decode_mb(MpegEncContext *s,
                         s->last_mv[0][i][0]=  s->mv[0][i][0] = mx;
                         s->last_mv[0][i][1]= (s->mv[0][i][1] = my)*2;
                     }
-                }else
-                    s->mv_dir = 0;
+                }
     
                 if(mb_type!=MB_TYPE_B_FORW){
                     s->mv_dir |= MV_DIR_BACKWARD;
-                    s->field_select[1][0]= get_bits1(&s->gb);
-                    s->field_select[1][1]= get_bits1(&s->gb);
 
                     for(i=0; i<2; i++){
                         mx = h263_decode_motion(s, s->last_mv[1][i][0]  , s->b_code);

-- 
Libav/FFmpeg packaging