diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-10-14 00:37:01 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-10-14 00:37:01 +0200 |
| commit | 6b1b63df85ffa020bb36ac8d444a83b755a1d86d (patch) | |
| tree | 232b69289597b1021be4547208b9e3e48ad6b45b /libavformat/version.h | |
| parent | 5dee3e8bb45d5f80f23a588a27e5d99caaa8f021 (diff) | |
| parent | 71549a857b13edf4c4f95037de6ed5bb4c4bd4af (diff) | |
Merge commit '71549a857b13edf4c4f95037de6ed5bb4c4bd4af'
* commit '71549a857b13edf4c4f95037de6ed5bb4c4bd4af':
http: Support auth method detection for POST
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 74ee29764e..ff38e9605d 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -31,7 +31,7 @@ #define LIBAVFORMAT_VERSION_MAJOR 55 #define LIBAVFORMAT_VERSION_MINOR 19 -#define LIBAVFORMAT_VERSION_MICRO 101 +#define LIBAVFORMAT_VERSION_MICRO 102 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ LIBAVFORMAT_VERSION_MINOR, \ |