diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-05-31 23:57:50 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-05-31 23:58:30 +0200 |
| commit | c140227a8bbc2699b724c9076dc706400eb5cccd (patch) | |
| tree | 4daa25a907e8ea08ee340cc05ebd592c89629d32 | |
| parent | 1ff47770ca500abf47761b581e366f3c0b528a30 (diff) | |
| parent | f7cafb5d02aa3f26c185f6f9851413ad77a73872 (diff) | |
| download | ffmpeg-c140227a8bbc2699b724c9076dc706400eb5cccd.tar.gz | |
Merge commit 'f7cafb5d02aa3f26c185f6f9851413ad77a73872'
* commit 'f7cafb5d02aa3f26c185f6f9851413ad77a73872':
x86: add AV_CPU_FLAG_AVXSLOW flag
Conflicts:
doc/APIchanges
libavutil/version.h
See: c312bfac4c8ac1ac55d6648fd6eb36db436100f3
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -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 11be5b8dad..5306c21be8 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -57,7 +57,7 @@ #define LIBAVUTIL_VERSION_MAJOR 54 #define LIBAVUTIL_VERSION_MINOR 26 -#define LIBAVUTIL_VERSION_MICRO 100 +#define LIBAVUTIL_VERSION_MICRO 101 #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ LIBAVUTIL_VERSION_MINOR, \ |