diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-08 19:32:59 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-08 19:42:49 +0200 |
| commit | ae77266fce26eac4f5267d158c65bdebfb64f780 (patch) | |
| tree | b731b91cf7982db063f38b3da8489484aefa43a3 /libavutil/version.h | |
| parent | 43c157f4a46cb76739f07782d23d1e4ff8da3253 (diff) | |
| parent | 78071a1420b425dfb787ac739048f523007b8139 (diff) | |
| download | ffmpeg-ae77266fce26eac4f5267d158c65bdebfb64f780.tar.gz | |
Merge commit '78071a1420b425dfb787ac739048f523007b8139'
* commit '78071a1420b425dfb787ac739048f523007b8139':
pixfmt: add AV_ prefixes to PIX_FMT_*
Conflicts:
doc/APIchanges
libavutil/pixfmt.h
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/version.h')
| -rw-r--r-- | libavutil/version.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/libavutil/version.h b/libavutil/version.h index 501d3cd2f5..d807a1955c 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -39,8 +39,8 @@ */ #define LIBAVUTIL_VERSION_MAJOR 51 -#define LIBAVUTIL_VERSION_MINOR 73 -#define LIBAVUTIL_VERSION_MICRO 102 +#define LIBAVUTIL_VERSION_MINOR 74 +#define LIBAVUTIL_VERSION_MICRO 100 #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ LIBAVUTIL_VERSION_MINOR, \ @@ -81,6 +81,9 @@ #ifndef FF_API_OLD_TC_ADJUST_FRAMENUM #define FF_API_OLD_TC_ADJUST_FRAMENUM (LIBAVUTIL_VERSION_MAJOR < 52) #endif +#ifndef FF_API_PIX_FMT +#define FF_API_PIX_FMT (LIBAVUTIL_VERSION_MAJOR < 52) +#endif /** * @} |