diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-29 11:32:24 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-29 11:32:24 +0200 |
| commit | 268ff17cb785c3ae94be0aca31ed8709e149b487 (patch) | |
| tree | 0d8f9f3b52d0430765ef2bfe389cbea1149b4ca8 /libavcodec/version.h | |
| parent | cf16b459a873b990efc10d93e9912ab01b8a0fba (diff) | |
| parent | c48456166e95648719a8be8f8613f9dee98205c1 (diff) | |
| download | ffmpeg-268ff17cb785c3ae94be0aca31ed8709e149b487.tar.gz | |
Merge commit 'c48456166e95648719a8be8f8613f9dee98205c1'
* commit 'c48456166e95648719a8be8f8613f9dee98205c1':
lavc: add MMAL hardware decoder wrapper
Conflicts:
Changelog
configure
doc/APIchanges
libavcodec/Makefile
libavcodec/allcodecs.c
libavcodec/version.h
libavutil/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 5a93c68e58..a351b080cc 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -29,7 +29,7 @@ #include "libavutil/version.h" #define LIBAVCODEC_VERSION_MAJOR 56 -#define LIBAVCODEC_VERSION_MINOR 31 +#define LIBAVCODEC_VERSION_MINOR 32 #define LIBAVCODEC_VERSION_MICRO 100 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ |