Correctly detect when use hpel or qpel mode

Originally committed as revision 5601 to svn://svn.ffmpeg.org/ffmpeg/trunk
19 years ago · 05103ed33f
parent ef6cc8ce46
commit 05103ed33f
1 changed files with 6 additions and 1 deletions
--- a/libavcodec/vc1.c
+++ b/libavcodec/vc1.c
@ -1330,7 +1330,12 @@ static int vc1_parse_frame_header(VC1Context *v, GetBitContext* gb)
        }
        if(v->mv_mode == MV_PMODE_1MV_HPEL || v->mv_mode == MV_PMODE_1MV_HPEL_BILIN)
            v->s.quarter_sample = 0;
-        else
+        else if(v->mv_mode == MV_PMODE_INTENSITY_COMP) {
+            if(v->mv_mode2 == MV_PMODE_1MV_HPEL || v->mv_mode2 == MV_PMODE_1MV_HPEL_BILIN)
+                v->s.quarter_sample = 0;
+            else
+                v->s.quarter_sample = 1;
+        } else
            v->s.quarter_sample = 1;

        if ((v->mv_mode == MV_PMODE_INTENSITY_COMP &&