diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-03 09:01:48 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-03 09:01:48 +0200 |
| commit | 8e970a58614fe15565d5849c933f17b9ec138647 (patch) | |
| tree | fa7091a33ffeaa1be11ee6ebb4f89c75de2d625f /libavformat/version.h | |
| parent | 7cd13f618c3cf47c21ec8128ed61f16a14c349ef (diff) | |
| parent | 0d6fa3977b016f1b72b0b24b8834ff9222498548 (diff) | |
Merge commit '0d6fa3977b016f1b72b0b24b8834ff9222498548'
* commit '0d6fa3977b016f1b72b0b24b8834ff9222498548':
rtmp: Add seek support
Conflicts:
Changelog
libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/version.h')
| -rw-r--r-- | libavformat/version.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/version.h b/libavformat/version.h index ed1c1966ec..c79ba78b58 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -30,8 +30,8 @@ #include "libavutil/avutil.h" #define LIBAVFORMAT_VERSION_MAJOR 55 -#define LIBAVFORMAT_VERSION_MINOR 12 -#define LIBAVFORMAT_VERSION_MICRO 102 +#define LIBAVFORMAT_VERSION_MINOR 13 +#define LIBAVFORMAT_VERSION_MICRO 100 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ LIBAVFORMAT_VERSION_MINOR, \ |