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/avcodec.h | |
| 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/avcodec.h')
| -rw-r--r-- | libavcodec/avcodec.h | 2 |
1 files changed, 2 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. |