diff options
| author | Anton Khirnov <anton@khirnov.net> | 2013-10-27 16:35:32 +0100 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2013-11-14 09:40:39 +0100 |
| commit | b6094811f9fca66cdf853420696e96fdc3e4987a (patch) | |
| tree | 8d9085a6861d31250dd4f6e357bed56ce74af229 /libavcodec/avcodec.h | |
| parent | b45c87083de67969c1598cfef41e7c947b137922 (diff) | |
| download | ffmpeg-b6094811f9fca66cdf853420696e96fdc3e4987a.tar.gz | |
lavc: move MB_TYPE_* macros from avcodec.h to mpegvideo.h
They are mpegvideo-specific and not supposed to be used by callers.
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 ad80a289de..93e1368f43 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -778,6 +778,7 @@ typedef struct RcOverride{ */ #define CODEC_CAP_VARIABLE_FRAME_SIZE 0x10000 +#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 @@ -801,6 +802,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. |