summaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorJerome Borsboom <jerome.borsboom@carpalis.nl>2018-04-23 21:00:08 +0200
committerPaul B Mahol <onemda@gmail.com>2018-04-25 22:07:20 +0200
commita1dc0bdaf49497358d70002ffb5ec498f5f41270 (patch)
tree2d5dbf6f60ba655ea590880fb27c73e736614546 /libavcodec
parent7a70879624a0981874df760356775eda871446a5 (diff)
downloadffmpeg-streaming-a1dc0bdaf49497358d70002ffb5ec498f5f41270.zip
ffmpeg-streaming-a1dc0bdaf49497358d70002ffb5ec498f5f41270.tar.gz
avcodec/vc1: correct mspel for field-interlace B frames
mspel indicates the use of bicubic interpolation. The check wrongly included MVMODE MV_PMODE_1MV_HPEL as using bilinear interpolation. Signed-off-by: Jerome Borsboom <jerome.borsboom@carpalis.nl>
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/vc1.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/vc1.c b/libavcodec/vc1.c
index bf4024c..5fc4793 100644
--- a/libavcodec/vc1.c
+++ b/libavcodec/vc1.c
@@ -1226,7 +1226,7 @@ int ff_vc1_parse_frame_header_adv(VC1Context *v, GetBitContext* gb)
v->mv_mode = ff_vc1_mv_pmode_table2[lowquant][mvmode];
v->qs_last = v->s.quarter_sample;
v->s.quarter_sample = (v->mv_mode == MV_PMODE_1MV || v->mv_mode == MV_PMODE_MIXED_MV);
- v->s.mspel = !(v->mv_mode == MV_PMODE_1MV_HPEL_BILIN || v->mv_mode == MV_PMODE_1MV_HPEL);
+ v->s.mspel = (v->mv_mode != MV_PMODE_1MV_HPEL_BILIN);
status = bitplane_decoding(v->forward_mb_plane, &v->fmb_is_raw, v);
if (status < 0)
return -1;
OpenPOWER on IntegriCloud