diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-27 09:22:42 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-27 09:33:28 +0200 |
| commit | e6e71fd7b563329aba1d72c1238b824295ab20c1 (patch) | |
| tree | 9141774ad81be809f1329efd8c897590515c287d /libavformat/version.h | |
| parent | f31011e9abfb2ae75bb32bc44e2c34194c8dc40a (diff) | |
| parent | 8b09d917e7dc7d7f2ace31419f802d4ff518236c (diff) | |
| download | ffmpeg-e6e71fd7b563329aba1d72c1238b824295ab20c1.tar.gz | |
Merge commit '8b09d917e7dc7d7f2ace31419f802d4ff518236c'
* commit '8b09d917e7dc7d7f2ace31419f802d4ff518236c':
tls: Add options for verifying the peer certificate
Conflicts:
doc/protocols.texi
libavformat/tls.c
libavformat/version.h
See: b2460858f64b2070d84dd861d4bbd16acfb9b0e9
See: 973a758f52a4e5fe63bd88806a4b2db034a032de
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 c2242329c4..a601072138 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -31,7 +31,7 @@ #define LIBAVFORMAT_VERSION_MAJOR 55 #define LIBAVFORMAT_VERSION_MINOR 18 -#define LIBAVFORMAT_VERSION_MICRO 102 +#define LIBAVFORMAT_VERSION_MICRO 103 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ LIBAVFORMAT_VERSION_MINOR, \ |