Merge commit 'f90729699db9ede2bef2b28000f1795dab1b8996'

[ffmpeg] / libavcodec / version.h

diff --git a/libavcodec/version.h b/libavcodec/version.h
index fedc35728ee83819e2a6dced89b115bcb30cfb86..7e570441788bdeaa8fa08ee9dfe1137f6d804b5d 100644 (file)
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@ -29,8 +29,8 @@
 #include "libavutil/version.h"
 
 #define LIBAVCODEC_VERSION_MAJOR 55
-#define LIBAVCODEC_VERSION_MINOR  68
-#define LIBAVCODEC_VERSION_MICRO 102
+#define LIBAVCODEC_VERSION_MINOR  69
+#define LIBAVCODEC_VERSION_MICRO 100
 
 #define LIBAVCODEC_VERSION_INT  AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
                                                LIBAVCODEC_VERSION_MINOR, \