diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-01 10:39:50 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-01 10:46:39 +0100 |
commit | a2bfee36b70bc9a5dd0a5a1cef36ca32bc1fba07 (patch) | |
tree | 01531bd775ded92bdfe25952a27c83655d7fc1c7 /libavcodec/version.h | |
parent | fc5fe4804fd2ee9a29de502e9431b12d027c0c89 (diff) | |
parent | 9af7a8523a6bb517834ebed36093bdab11a8b38e (diff) | |
download | ffmpeg-a2bfee36b70bc9a5dd0a5a1cef36ca32bc1fba07.tar.gz |
Merge commit '9af7a8523a6bb517834ebed36093bdab11a8b38e'
* commit '9af7a8523a6bb517834ebed36093bdab11a8b38e':
HNM4/HNM4A demuxer & video decoder
Conflicts:
Changelog
doc/general.texi
libavcodec/Makefile
libavcodec/allcodecs.c
libavcodec/avcodec.h
libavcodec/version.h
libavformat/Makefile
libavformat/allformats.c
libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/version.h')
-rw-r--r-- | libavcodec/version.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/version.h b/libavcodec/version.h index 75283627f8..073c8dc8c6 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -29,7 +29,7 @@ #include "libavutil/avutil.h" #define LIBAVCODEC_VERSION_MAJOR 55 -#define LIBAVCODEC_VERSION_MINOR 39 +#define LIBAVCODEC_VERSION_MINOR 40 #define LIBAVCODEC_VERSION_MICRO 100 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ |