diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-18 03:12:10 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-10-18 03:12:10 +0200 |
| commit | 7891b4fa590b3d21da028e56bf2c1eee1fe8260f (patch) | |
| tree | c61c9203c6666be7e1375642028f19b34a305cd6 /libavformat/version.h | |
| parent | 178764e833b14513ca4aaffa83f3d8444759a6ee (diff) | |
| parent | 9bec3ca2b878c83d2337bc6095bd51c3e3f8eef0 (diff) | |
| download | ffmpeg-7891b4fa590b3d21da028e56bf2c1eee1fe8260f.tar.gz | |
Merge commit '9bec3ca2b878c83d2337bc6095bd51c3e3f8eef0'
* commit '9bec3ca2b878c83d2337bc6095bd51c3e3f8eef0':
rtmpproto: Add pause support
Conflicts:
libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
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 62f1c26616..dfc0968e16 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -31,7 +31,7 @@ #define LIBAVFORMAT_VERSION_MAJOR 56 #define LIBAVFORMAT_VERSION_MINOR 9 -#define LIBAVFORMAT_VERSION_MICRO 100 +#define LIBAVFORMAT_VERSION_MICRO 101 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ LIBAVFORMAT_VERSION_MINOR, \ |