diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-13 22:39:54 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-13 22:39:54 +0200 |
| commit | 2ba45778095cdd6e1438644e4797b76e9de6c672 (patch) | |
| tree | 6d7ef68dc6929b79854a0e9803cdb69bc70501e4 /libavutil/version.h | |
| parent | ed8e6d535cf4c56d82f9c91646dfc42787b719d6 (diff) | |
| parent | a8c104a511f97e4ea617df73b31737e28a8a5126 (diff) | |
| download | ffmpeg-2ba45778095cdd6e1438644e4797b76e9de6c672.tar.gz | |
Merge commit 'a8c104a511f97e4ea617df73b31737e28a8a5126'
* commit 'a8c104a511f97e4ea617df73b31737e28a8a5126':
AVOption: add support for dictionary types.
Conflicts:
libavutil/opt.c
libavutil/opt.h
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/version.h')
| -rw-r--r-- | libavutil/version.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavutil/version.h b/libavutil/version.h index 23b331de24..43114c7899 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -56,7 +56,7 @@ */ #define LIBAVUTIL_VERSION_MAJOR 54 -#define LIBAVUTIL_VERSION_MINOR 1 +#define LIBAVUTIL_VERSION_MINOR 2 #define LIBAVUTIL_VERSION_MICRO 100 #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ |