RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-02-01 04:13:57 +00:00
Code Issues Projects Releases Wiki Activity

lavc/h264: move MB_TYPE defs from h264dec.h to h264_parse

Browse Source 
Allows to stop including h264dec.h in h264data.c.
This commit is contained in:
Anton Khirnov 2022-01-24 18:00:11 +01:00 committed by Andreas Rheinhardt
parent 2f1716dcd6
commit ded77f5654
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libavcodec/h264_parse.h
View File

@ -33,6 +33,9 @@
#include "get_bits.h"
#include "h264_ps.h"
#define MB_TYPE_REF0 MB_TYPE_ACPRED // dirty but it fits in 16 bit
#define MB_TYPE_8x8DCT 0x01000000
// This table must be here because scan8[constant] must be known at compiletime
static const uint8_t scan8[16 * 3 + 3] = {
4 + 1 * 8, 5 + 1 * 8, 4 + 2 * 8, 5 + 2 * 8,

2
libavcodec/h264data.c
View File

@ -30,7 +30,7 @@
#include "libavutil/avutil.h"
#include "h264dec.h"
#include "h264_parse.h"
#include "h264data.h"
#include "mpegutils.h"

2
libavcodec/h264dec.h
View File

@ -95,8 +95,6 @@
#define CHROMA422(h) ((h)->ps.sps->chroma_format_idc == 2)
#define CHROMA444(h) ((h)->ps.sps->chroma_format_idc == 3)
#define MB_TYPE_REF0 MB_TYPE_ACPRED // dirty but it fits in 16 bit
#define MB_TYPE_8x8DCT 0x01000000
#define IS_REF0(a) ((a) & MB_TYPE_REF0)
#define IS_8x8DCT(a) ((a) & MB_TYPE_8x8DCT)