diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-07-29 20:09:15 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-29 20:24:42 +0200 |
| commit | 31e0b5d3cb40acd960b6f6c711557a82dc2d6c5f (patch) | |
| tree | c2854dbdc4da5a38bf9b791e7288ae9b3d7688c9 /libavutil/version.h | |
| parent | e066f01539fd2ed19bda2031c43ddf266f0a000a (diff) | |
| parent | 69e7336b8e16ee65226fc20381baf537f4b125e6 (diff) | |
| download | ffmpeg-31e0b5d3cb40acd960b6f6c711557a82dc2d6c5f.tar.gz | |
Merge commit '69e7336b8e16ee65226fc20381baf537f4b125e6'
* commit '69e7336b8e16ee65226fc20381baf537f4b125e6':
avstring: Expose the simple name match function
Conflicts:
libavutil/avstring.c
libavutil/avstring.h
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/version.h')
| -rw-r--r-- | libavutil/version.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavutil/version.h b/libavutil/version.h index 6d8d6f0ced..0c69a7893b 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -56,8 +56,8 @@ */ #define LIBAVUTIL_VERSION_MAJOR 52 -#define LIBAVUTIL_VERSION_MINOR 92 -#define LIBAVUTIL_VERSION_MICRO 101 +#define LIBAVUTIL_VERSION_MINOR 93 +#define LIBAVUTIL_VERSION_MICRO 100 #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ LIBAVUTIL_VERSION_MINOR, \ |