diff options
| author | Kostya Shishkov <kostya.shishkov@gmail.com> | 2006-07-03 17:22:18 +0000 |
|---|---|---|
| committer | Kostya Shishkov <kostya.shishkov@gmail.com> | 2006-07-03 17:22:18 +0000 |
| commit | 05103ed33ffe37a6ea01ff6c5b26d495789b70c8 (patch) | |
| tree | ddba4218a33069965f44cb35cf84c8db82ef9272 | |
| parent | ef6cc8ce469f78a019661d7235c74d11db5bf198 (diff) | |
| download | ffmpeg-05103ed33ffe37a6ea01ff6c5b26d495789b70c8.tar.gz | |
Correctly detect when use hpel or qpel mode
Originally committed as revision 5601 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/vc1.c | 7 |
1 files changed, 6 insertions, 1 deletions
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 && |