Browse Source

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>
tags/n4.1
Jerome Borsboom Paul B Mahol 7 years ago
parent
commit
dd1e717f5b
1 changed files with 3 additions and 3 deletions
  1. +3
    -3
      libavcodec/vc1data.c

+ 3
- 3
libavcodec/vc1data.c View File

@@ -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 }
}
};


Loading…
Cancel
Save