diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-04-18 15:47:05 +0100 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-04-18 15:47:54 +0100 |
| commit | 299d4f9428c2f4d16a1575d80d80caacdd850606 (patch) | |
| tree | 79ed46565ed50be08459daa2d66f5f5789fb625d /libavformat/version.h | |
| parent | 4eef36a4f6db1feb9d628337bd96e07a9b482c1a (diff) | |
| parent | ccea588f831906084b8c8235222920e6984beb72 (diff) | |
Merge commit 'ccea588f831906084b8c8235222920e6984beb72'
* commit 'ccea588f831906084b8c8235222920e6984beb72':
avio: Add an option 'rw_timeout'
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'libavformat/version.h')
| -rw-r--r-- | libavformat/version.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/version.h b/libavformat/version.h index 8504468d59..93b87ebe0e 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -31,7 +31,7 @@ #define LIBAVFORMAT_VERSION_MAJOR 57 #define LIBAVFORMAT_VERSION_MINOR 34 -#define LIBAVFORMAT_VERSION_MICRO 101 +#define LIBAVFORMAT_VERSION_MICRO 102 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ LIBAVFORMAT_VERSION_MINOR, \ |