Correctly detect when use hpel or qpel mode

Originally committed as revision 5601 to svn://svn.ffmpeg.org/ffmpeg/trunk

Correctly detect when use hpel or qpel mode
Originally committed as revision 5601 to svn://svn.ffmpeg.org/ffmpeg/trunk
05103ed3 · Kostya Shishkov · ef6cc8ce · 05103ed3
Commit 05103ed3 authored Jul 03, 2006 by Kostya Shishkov
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 1 deletion

vc1.c libavcodec/vc1.c +6 -1

No files found.
--- 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 &&