diff options
| author | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2024-06-02 18:36:49 +0200 |
|---|---|---|
| committer | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2024-06-20 18:58:38 +0200 |
| commit | 4cdd684e86136c42719632cbdcc7647d0f60f87f (patch) | |
| tree | d3582d53765894e27e11763e60e621b1d63ed649 | |
| parent | dd1e804a987d7464d9bfd7c25dd9ef295223bd36 (diff) | |
| download | ffmpeg-4cdd684e86136c42719632cbdcc7647d0f60f87f.tar.gz | |
avcodec/mpegutils: Remap MB_TYPE_{GMC,SKIP,CBP,QUANT}
Do this to make MB_TYPE_{CBP,QUANT} fit into an int16_t,
so that can be used in a VLC symbol table.
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
| -rw-r--r-- | libavcodec/mpegutils.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/mpegutils.h b/libavcodec/mpegutils.h index 0cca4f0a2f..8597ca18b8 100644 --- a/libavcodec/mpegutils.h +++ b/libavcodec/mpegutils.h @@ -45,8 +45,8 @@ #define MB_TYPE_8x8 (1 << 6) #define MB_TYPE_INTERLACED (1 << 7) #define MB_TYPE_DIRECT2 (1 << 8) // FIXME -#define MB_TYPE_GMC (1 << 10) -#define MB_TYPE_SKIP (1 << 11) +#define MB_TYPE_CBP (1 << 10) +#define MB_TYPE_QUANT (1 << 11) #define MB_TYPE_P0L0 (1 << 12) #define MB_TYPE_P1L0 (1 << 13) #define MB_TYPE_P0L1 (1 << 14) @@ -54,8 +54,8 @@ #define MB_TYPE_L0 (MB_TYPE_P0L0 | MB_TYPE_P1L0) #define MB_TYPE_L1 (MB_TYPE_P0L1 | MB_TYPE_P1L1) #define MB_TYPE_L0L1 (MB_TYPE_L0 | MB_TYPE_L1) -#define MB_TYPE_QUANT (1 << 16) -#define MB_TYPE_CBP (1 << 17) +#define MB_TYPE_GMC (1 << 16) +#define MB_TYPE_SKIP (1 << 17) #define MB_TYPE_ACPRED (1 << 18) #define MB_TYPE_INTRA MB_TYPE_INTRA4x4 // default mb_type if there is just one type |