aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKostya Shishkov <kostya.shishkov@gmail.com>2006-07-29 03:11:14 +0000
committerKostya Shishkov <kostya.shishkov@gmail.com>2006-07-29 03:11:14 +0000
commit09be55df9c78c494d597d1a073f4f9ccc0e55cfc (patch)
treeec3823f7f42ff4eaf9b73e3ebc8b3b21b70ff654
parentffb9a8b1b6d199cb7665c17a0e79612d02f5f979 (diff)
downloadffmpeg-09be55df9c78c494d597d1a073f4f9ccc0e55cfc.tar.gz
Set MpegEncContext->mspel flag (here it indicates that bicubic MC will be use)
Originally committed as revision 5845 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavcodec/vc1.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/vc1.c b/libavcodec/vc1.c
index 3c74939461..33a2414bb4 100644
--- a/libavcodec/vc1.c
+++ b/libavcodec/vc1.c
@@ -1474,6 +1474,7 @@ static int vc1_parse_frame_header(VC1Context *v, GetBitContext* gb)
v->s.quarter_sample = 1;
} else
v->s.quarter_sample = 1;
+ v->s.mspel = !(v->mv_mode == MV_PMODE_1MV_HPEL_BILIN || (v->mv_mode == MV_PMODE_INTENSITY_COMP && v->mv_mode2 == MV_PMODE_1MV_HPEL_BILIN));
if ((v->mv_mode == MV_PMODE_INTENSITY_COMP &&
v->mv_mode2 == MV_PMODE_MIXED_MV)
@@ -1523,6 +1524,7 @@ static int vc1_parse_frame_header(VC1Context *v, GetBitContext* gb)
lowquant = (v->pq > 12) ? 0 : 1;
v->mv_mode = get_bits1(gb) ? MV_PMODE_1MV : MV_PMODE_1MV_HPEL_BILIN;
v->s.quarter_sample = (v->mv_mode == MV_PMODE_1MV);
+ v->s.mspel = v->s.quarter_sample;
status = bitplane_decoding(v->direct_mb_plane, &v->dmb_is_raw, v);
if (status < 0) return -1;