aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/version.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-10-14 00:17:49 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-10-14 00:17:49 +0200
commit5dee3e8bb45d5f80f23a588a27e5d99caaa8f021 (patch)
treedd227f2db4fce5285df0c5bb26262bf6ad525838 /libavformat/version.h
parent005200887b2c9df2e489bd6419697a6841dba396 (diff)
parenteb8b05a3824a9fa85e20d603595ac8a3b83505d4 (diff)
downloadffmpeg-5dee3e8bb45d5f80f23a588a27e5d99caaa8f021.tar.gz
Merge commit 'eb8b05a3824a9fa85e20d603595ac8a3b83505d4'
* commit 'eb8b05a3824a9fa85e20d603595ac8a3b83505d4': http: Add an option for forcing basic authentication Conflicts: libavformat/http.c libavformat/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/version.h')
-rw-r--r--libavformat/version.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/version.h b/libavformat/version.h
index 32e76c78c0..74ee29764e 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 100
+#define LIBAVFORMAT_VERSION_MICRO 101
#define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
LIBAVFORMAT_VERSION_MINOR, \