From 05103ed33ffe37a6ea01ff6c5b26d495789b70c8 Mon Sep 17 00:00:00 2001 From: Kostya Shishkov Date: Mon, 3 Jul 2006 17:22:18 +0000 Subject: [PATCH] Correctly detect when use hpel or qpel mode Originally committed as revision 5601 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/vc1.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/libavcodec/vc1.c b/libavcodec/vc1.c index 047cdeec2b..eec0efc14c 100644 --- 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 &&