diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-14 00:29:06 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-14 00:29:06 +0200 |
| commit | c8571c61ec4c352e7eac7147b7c1644d2406189e (patch) | |
| tree | 7b30d14ae332d5b9d5b79ba257cc2833d28e3855 /libavutil/version.h | |
| parent | 097bf149c92aeae8af7f3559878e046a047e892d (diff) | |
| parent | 8ddc32629a6d6be77256694c9e322dde134609f3 (diff) | |
Merge commit '8ddc32629a6d6be77256694c9e322dde134609f3'
* commit '8ddc32629a6d6be77256694c9e322dde134609f3':
mem: add av_strndup() for duplicating substrings
Conflicts:
libavutil/mem.c
libavutil/mem.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 43114c7899..f5b92778e2 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -56,7 +56,7 @@ */ #define LIBAVUTIL_VERSION_MAJOR 54 -#define LIBAVUTIL_VERSION_MINOR 2 +#define LIBAVUTIL_VERSION_MINOR 3 #define LIBAVUTIL_VERSION_MICRO 100 #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ |