diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-01 14:04:50 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-01 14:04:50 +0100 |
| commit | 9336a980bb2608089ad34cbf605fbb5ed9bca677 (patch) | |
| tree | 6f94f20b462758e9c43598cb8c100f381bfde4dc /libavformat/version.h | |
| parent | 8e4e532bb28ef8713145ec85aafac3b3fe2775e3 (diff) | |
| parent | c1ea44c54d837a69d8285601cfba7aa8df16e053 (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
rtmp: Add support for limelight authentication
rtmp: Add support for adobe authentication
Conflicts:
Changelog
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 00ce71dbe6..f161ef9dac 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -31,7 +31,7 @@ #define LIBAVFORMAT_VERSION_MAJOR 54 #define LIBAVFORMAT_VERSION_MINOR 58 -#define LIBAVFORMAT_VERSION_MICRO 100 +#define LIBAVFORMAT_VERSION_MICRO 102 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ LIBAVFORMAT_VERSION_MINOR, \ |