summaryrefslogtreecommitdiff
path: root/libavcodec/vc1data.c
diff options
context:
space:
mode:
authorJerome Borsboom <jerome.borsboom@carpalis.nl>2018-04-23 20:59:20 +0200
committerPaul B Mahol <onemda@gmail.com>2018-04-25 22:07:20 +0200
commitdd1e717f5b799ebf9c813647fbce9da18a91a196 (patch)
tree3c80dfbaf9b5c291f78c5acb018f952e2c3f12ac /libavcodec/vc1data.c
parent79f8074cc4055e96d55752554afeee4db9d4e0c8 (diff)
downloadffmpeg-dd1e717f5b799ebf9c813647fbce9da18a91a196.tar.gz
avcodec/vc1: correct ff_vc1_mbmode_intfrp
According to VC-1 spec 10.7.3.4, FIELDTX shall be set to the same type as the motion vector for zero-coded blocks. Signed-off-by: Jerome Borsboom <jerome.borsboom@carpalis.nl>
Diffstat (limited to 'libavcodec/vc1data.c')
-rw-r--r--libavcodec/vc1data.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/vc1data.c b/libavcodec/vc1data.c
index fc9ba6da13..0df7d4d666 100644
--- a/libavcodec/vc1data.c
+++ b/libavcodec/vc1data.c
@@ -61,7 +61,7 @@ const uint8_t ff_vc1_mbmode_intfrp[2][15][4] = {
{ MV_PMODE_INTFR_1MV , 1, 0, 1 },
{ MV_PMODE_INTFR_2MV_FIELD, 0, 0, 1 },
{ MV_PMODE_INTFR_2MV_FIELD, 1, 0, 1 },
- { MV_PMODE_INTFR_2MV_FIELD, 0, 0, 0 },
+ { MV_PMODE_INTFR_2MV_FIELD, 1, 0, 0 },
{ MV_PMODE_INTFR_INTRA , 0, 0, 0 }
},
{
@@ -73,13 +73,13 @@ const uint8_t ff_vc1_mbmode_intfrp[2][15][4] = {
{ MV_PMODE_INTFR_1MV , 1, 0, 1 },
{ MV_PMODE_INTFR_2MV_FIELD, 0, 0, 1 },
{ MV_PMODE_INTFR_2MV_FIELD, 1, 0, 1 },
- { MV_PMODE_INTFR_2MV_FIELD, 0, 0, 0 },
+ { MV_PMODE_INTFR_2MV_FIELD, 1, 0, 0 },
{ MV_PMODE_INTFR_4MV , 0, 0, 1 },
{ MV_PMODE_INTFR_4MV , 1, 0, 1 },
{ MV_PMODE_INTFR_4MV , 0, 0, 0 },
{ MV_PMODE_INTFR_4MV_FIELD, 0, 0, 1 },
{ MV_PMODE_INTFR_4MV_FIELD, 1, 0, 1 },
- { MV_PMODE_INTFR_4MV_FIELD, 0, 0, 0 },
+ { MV_PMODE_INTFR_4MV_FIELD, 1, 0, 0 },
{ MV_PMODE_INTFR_INTRA , 0, 0, 0 }
}
};