diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-01 19:03:59 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-01 19:03:59 +0400 |
| commit | e77b9853ea66ef6c34b04d121c5b3d1afaa33971 (patch) | |
| tree | d29ef557ca9f706269711b2a31663d956f237996 /libavcodec/version.h | |
| parent | e40ae8cc00ae7e485a64a5b3b40b73dbfd32b631 (diff) | |
| parent | a2941c8cb216bdc144953cace64973f5600ffa2d (diff) | |
Merge commit 'a2941c8cb216bdc144953cace64973f5600ffa2d'
* commit 'a2941c8cb216bdc144953cace64973f5600ffa2d':
lavc: move CODEC_FLAG_MV0 to mpegvideo
Conflicts:
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/version.h')
| -rw-r--r-- | libavcodec/version.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libavcodec/version.h b/libavcodec/version.h index a13d479026..cd2b0d89c3 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -30,7 +30,7 @@ #define LIBAVCODEC_VERSION_MAJOR 55 #define LIBAVCODEC_VERSION_MINOR 60 -#define LIBAVCODEC_VERSION_MICRO 102 +#define LIBAVCODEC_VERSION_MICRO 103 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ LIBAVCODEC_VERSION_MINOR, \ @@ -156,5 +156,8 @@ #ifndef FF_API_GMC #define FF_API_GMC (LIBAVCODEC_VERSION_MAJOR < 57) #endif +#ifndef FF_API_MV0 +#define FF_API_MV0 (LIBAVCODEC_VERSION_MAJOR < 57) +#endif #endif /* AVCODEC_VERSION_H */ |