diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2016-01-02 11:01:29 +0100 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2016-01-02 11:01:29 +0100 |
| commit | e754c8e8caa78d75efff5cb2d979635477c20378 (patch) | |
| tree | 15d6289f14563c8db638f565dd0e8f75e18cbd71 /libavutil/version.h | |
| parent | 00e91d06767a5a28524cbfc271141970f744db23 (diff) | |
| parent | e2710e790c09e49e86baa58c6063af0097cc8cb0 (diff) | |
| download | ffmpeg-e754c8e8caa78d75efff5cb2d979635477c20378.tar.gz | |
Merge commit 'e2710e790c09e49e86baa58c6063af0097cc8cb0'
* commit 'e2710e790c09e49e86baa58c6063af0097cc8cb0':
arm: add a cpu flag for the VFPv2 vector mode
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
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 22cd66b554..9ffa7a8666 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -64,7 +64,7 @@ */ #define LIBAVUTIL_VERSION_MAJOR 55 -#define LIBAVUTIL_VERSION_MINOR 11 +#define LIBAVUTIL_VERSION_MINOR 12 #define LIBAVUTIL_VERSION_MICRO 100 #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ |