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/version.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/version.h')
| -rw-r--r-- | libavcodec/version.h | 3 |
1 files changed, 3 insertions, 0 deletions
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 */ |