diff options
| author | James Almer <jamrial@gmail.com> | 2017-10-23 21:59:02 +0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-10-23 21:59:02 +0300 |
| commit | f7eb1c9ac55bd27583419fb09c3dbb70b3ce56bc (patch) | |
| tree | 8e9ce08b38422f730f3cd78fb10f1c15c444ca40 /libavcodec/mpegutils.h | |
| parent | 0b79fdeb9a81b8a568c7efea1063352338f4aa5b (diff) | |
| parent | da5ba26b9e25f408e8d2f9428c9eca699f11a7db (diff) | |
Merge commit 'da5ba26b9e25f408e8d2f9428c9eca699f11a7db'
* commit 'da5ba26b9e25f408e8d2f9428c9eca699f11a7db':
lavc: Drop deprecated macroblock type symbols
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavcodec/mpegutils.h')
| -rw-r--r-- | libavcodec/mpegutils.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/libavcodec/mpegutils.h b/libavcodec/mpegutils.h index 9cfadfc4cf..1bf73fea02 100644 --- a/libavcodec/mpegutils.h +++ b/libavcodec/mpegutils.h @@ -48,7 +48,6 @@ #define MAX_FCODE 7 /* MB types */ -#if !FF_API_MB_TYPE #define MB_TYPE_INTRA4x4 (1 << 0) #define MB_TYPE_INTRA16x16 (1 << 1) // FIXME H.264-specific #define MB_TYPE_INTRA_PCM (1 << 2) // FIXME H.264-specific @@ -70,7 +69,6 @@ #define MB_TYPE_L0L1 (MB_TYPE_L0 | MB_TYPE_L1) #define MB_TYPE_QUANT (1 << 16) #define MB_TYPE_CBP (1 << 17) -#endif #define MB_TYPE_INTRA MB_TYPE_INTRA4x4 // default mb_type if there is just one type |