diff options
Diffstat (limited to 'src/libffmpeg/libavcodec/mpeg12data.h')
| -rw-r--r-- | src/libffmpeg/libavcodec/mpeg12data.h | 29 |
1 files changed, 17 insertions, 12 deletions
diff --git a/src/libffmpeg/libavcodec/mpeg12data.h b/src/libffmpeg/libavcodec/mpeg12data.h index dd94bb572..42b3d49a1 100644 --- a/src/libffmpeg/libavcodec/mpeg12data.h +++ b/src/libffmpeg/libavcodec/mpeg12data.h @@ -283,10 +283,8 @@ static const uint8_t mbPatTable[63][2] = { {0xc, 6} }; -#define MB_TYPE_PAT 0x40000000 #define MB_TYPE_ZERO_MV 0x20000000 #define IS_ZERO_MV(a) ((a)&MB_TYPE_ZERO_MV) -#define IS_PAT(a) ((a)&MB_TYPE_PAT) static const uint8_t table_mb_ptype[7][2] = { { 3, 5 }, // 0x01 MB_INTRA @@ -300,12 +298,12 @@ static const uint8_t table_mb_ptype[7][2] = { static const uint32_t ptype2mb_type[7] = { MB_TYPE_INTRA, - MB_TYPE_L0 | MB_TYPE_PAT | MB_TYPE_ZERO_MV | MB_TYPE_16x16, + MB_TYPE_L0 | MB_TYPE_CBP | MB_TYPE_ZERO_MV | MB_TYPE_16x16, MB_TYPE_L0, - MB_TYPE_L0 | MB_TYPE_PAT, + MB_TYPE_L0 | MB_TYPE_CBP, MB_TYPE_QUANT | MB_TYPE_INTRA, - MB_TYPE_QUANT | MB_TYPE_L0 | MB_TYPE_PAT | MB_TYPE_ZERO_MV | MB_TYPE_16x16, - MB_TYPE_QUANT | MB_TYPE_L0 | MB_TYPE_PAT, + MB_TYPE_QUANT | MB_TYPE_L0 | MB_TYPE_CBP | MB_TYPE_ZERO_MV | MB_TYPE_16x16, + MB_TYPE_QUANT | MB_TYPE_L0 | MB_TYPE_CBP, }; static const uint8_t table_mb_btype[11][2] = { @@ -325,15 +323,15 @@ static const uint8_t table_mb_btype[11][2] = { static const uint32_t btype2mb_type[11] = { MB_TYPE_INTRA, MB_TYPE_L1, - MB_TYPE_L1 | MB_TYPE_PAT, + MB_TYPE_L1 | MB_TYPE_CBP, MB_TYPE_L0, - MB_TYPE_L0 | MB_TYPE_PAT, + MB_TYPE_L0 | MB_TYPE_CBP, MB_TYPE_L0L1, - MB_TYPE_L0L1 | MB_TYPE_PAT, + MB_TYPE_L0L1 | MB_TYPE_CBP, MB_TYPE_QUANT | MB_TYPE_INTRA, - MB_TYPE_QUANT | MB_TYPE_L1 | MB_TYPE_PAT, - MB_TYPE_QUANT | MB_TYPE_L0 | MB_TYPE_PAT, - MB_TYPE_QUANT | MB_TYPE_L0L1 | MB_TYPE_PAT, + MB_TYPE_QUANT | MB_TYPE_L1 | MB_TYPE_CBP, + MB_TYPE_QUANT | MB_TYPE_L0 | MB_TYPE_CBP, + MB_TYPE_QUANT | MB_TYPE_L0L1 | MB_TYPE_CBP, }; static const uint8_t mbMotionVectorTable[17][2] = { @@ -435,3 +433,10 @@ static const AVRational mpeg2_aspect[16]={ {0,1}, }; +static const uint8_t svcd_scan_offset_placeholder[14]={ + 0x10, 0x0E, + 0x00, 0x80, 0x81, + 0x00, 0x80, 0x81, + 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, +}; |