diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-12 15:29:20 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-12 15:35:39 +0100 |
| commit | a75f01d7e0bf166a0b443eb15621753619bb8d88 (patch) | |
| tree | 64b70ee469a4e74f63e5d4b13efddcc58bbea350 /libavformat | |
| parent | c292e340ed0835b112309629e06765c319c5eb42 (diff) | |
| parent | d8b31be6caebd8d1321ecb754b6e7daaf81dc111 (diff) | |
Merge commit 'd8b31be6caebd8d1321ecb754b6e7daaf81dc111'
* commit 'd8b31be6caebd8d1321ecb754b6e7daaf81dc111':
Add the bumps and APIchanges entries for reference counted buffers changes.
Conflicts:
Changelog
doc/APIchanges
libavcodec/version.h
libavdevice/version.h
libavfilter/version.h
libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/version.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavformat/version.h b/libavformat/version.h index 672b9003bf..6cf5850de8 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -29,9 +29,9 @@ #include "libavutil/avutil.h" -#define LIBAVFORMAT_VERSION_MAJOR 54 -#define LIBAVFORMAT_VERSION_MINOR 63 -#define LIBAVFORMAT_VERSION_MICRO 104 +#define LIBAVFORMAT_VERSION_MAJOR 55 +#define LIBAVFORMAT_VERSION_MINOR 0 +#define LIBAVFORMAT_VERSION_MICRO 100 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ LIBAVFORMAT_VERSION_MINOR, \ @@ -83,7 +83,7 @@ #define FF_API_AV_GETTIME (LIBAVFORMAT_VERSION_MAJOR < 55) #endif #ifndef FF_API_R_FRAME_RATE -#define FF_API_R_FRAME_RATE (LIBAVFORMAT_VERSION_MAJOR < 55) +#define FF_API_R_FRAME_RATE 1 #endif #endif /* AVFORMAT_VERSION_H */ |