diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-14 13:49:31 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-14 14:01:24 +0100 |
| commit | dbfa4317f3f8df13d889732d62f8d6abef2ac620 (patch) | |
| tree | 6c14995de6623ceccc903ca3785e85eeffc5710f /libavcodec | |
| parent | d67d3e29779ac113fbf806754ef9398e52cd288b (diff) | |
| parent | b6094811f9fca66cdf853420696e96fdc3e4987a (diff) | |
| download | ffmpeg-dbfa4317f3f8df13d889732d62f8d6abef2ac620.tar.gz | |
Merge commit 'b6094811f9fca66cdf853420696e96fdc3e4987a'
* commit 'b6094811f9fca66cdf853420696e96fdc3e4987a':
lavc: move MB_TYPE_* macros from avcodec.h to mpegvideo.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/avcodec.h | 2 | ||||
| -rw-r--r-- | libavcodec/mpegvideo.h | 24 | ||||
| -rw-r--r-- | libavcodec/version.h | 3 |
3 files changed, 29 insertions, 0 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index df0ec13385..084f2ae1b4 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -851,6 +851,7 @@ typedef struct RcOverride{ */ #define CODEC_CAP_LOSSLESS 0x80000000 +#if FF_API_MB_TYPE //The following defines may change, don't expect compatibility if you use them. #define MB_TYPE_INTRA4x4 0x0001 #define MB_TYPE_INTRA16x16 0x0002 //FIXME H.264-specific @@ -874,6 +875,7 @@ typedef struct RcOverride{ #define MB_TYPE_QUANT 0x00010000 #define MB_TYPE_CBP 0x00020000 //Note bits 24-31 are reserved for codec specific use (h264 ref0, mpeg1 0mv, ...) +#endif /** * Pan Scan area. diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h index bf867b5ac3..79b391ca1c 100644 --- a/libavcodec/mpegvideo.h +++ b/libavcodec/mpegvideo.h @@ -108,6 +108,30 @@ typedef struct Picture{ AVBufferRef *mb_type_buf; uint32_t *mb_type; +#if !FF_API_MB_TYPE +#define MB_TYPE_INTRA4x4 0x0001 +#define MB_TYPE_INTRA16x16 0x0002 //FIXME H.264-specific +#define MB_TYPE_INTRA_PCM 0x0004 //FIXME H.264-specific +#define MB_TYPE_16x16 0x0008 +#define MB_TYPE_16x8 0x0010 +#define MB_TYPE_8x16 0x0020 +#define MB_TYPE_8x8 0x0040 +#define MB_TYPE_INTERLACED 0x0080 +#define MB_TYPE_DIRECT2 0x0100 //FIXME +#define MB_TYPE_ACPRED 0x0200 +#define MB_TYPE_GMC 0x0400 +#define MB_TYPE_SKIP 0x0800 +#define MB_TYPE_P0L0 0x1000 +#define MB_TYPE_P1L0 0x2000 +#define MB_TYPE_P0L1 0x4000 +#define MB_TYPE_P1L1 0x8000 +#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 0x00010000 +#define MB_TYPE_CBP 0x00020000 +#endif + AVBufferRef *mbskip_table_buf; uint8_t *mbskip_table; diff --git a/libavcodec/version.h b/libavcodec/version.h index 45a782fba8..75beb45358 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -126,5 +126,8 @@ #ifndef FF_API_QSCALE_TYPE #define FF_API_QSCALE_TYPE (LIBAVCODEC_VERSION_MAJOR < 56) #endif +#ifndef FF_API_MB_TYPE +#define FF_API_MB_TYPE (LIBAVCODEC_VERSION_MAJOR < 56) +#endif #endif /* AVCODEC_VERSION_H */ |