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 /libavcodec | |
| parent | c292e340ed0835b112309629e06765c319c5eb42 (diff) | |
| parent | d8b31be6caebd8d1321ecb754b6e7daaf81dc111 (diff) | |
| download | ffmpeg-streaming-a75f01d7e0bf166a0b443eb15621753619bb8d88.zip ffmpeg-streaming-a75f01d7e0bf166a0b443eb15621753619bb8d88.tar.gz | |
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 'libavcodec')
| -rw-r--r-- | libavcodec/version.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/version.h b/libavcodec/version.h index 50a203b..3e01b47 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -28,8 +28,8 @@ #include "libavutil/avutil.h" -#define LIBAVCODEC_VERSION_MAJOR 54 -#define LIBAVCODEC_VERSION_MINOR 92 +#define LIBAVCODEC_VERSION_MAJOR 55 +#define LIBAVCODEC_VERSION_MINOR 0 #define LIBAVCODEC_VERSION_MICRO 100 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ |
