X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavutil%2Fversion.h;h=7d32c7b889f2d639a76802b71822de1bc1c32738;hb=5e553cab68ea7d4937ea8fb2993f5006fccbddcf;hp=07618fc0bc0cbb3e245aa7c1526ec39135056ea1;hpb=775389fc59bc46ac00babc1baf35e273e65f8541;p=ffmpeg

diff --git a/libavutil/version.h b/libavutil/version.h
index 07618fc0bc0..7d32c7b889f 100644
--- a/libavutil/version.h
+++ b/libavutil/version.h
@@ -18,6 +18,12 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+/**
+ * @file
+ * @ingroup lavu
+ * Libavutil version macros
+ */
+
 #ifndef AVUTIL_VERSION_H
 #define AVUTIL_VERSION_H
 
@@ -29,6 +35,21 @@
  * Useful to check and match library version in order to maintain
  * backward compatibility.
  *
+ * The FFmpeg libraries follow a versioning sheme very similar to
+ * Semantic Versioning (http://semver.org/)
+ * The difference is that the component called PATCH is called MICRO in FFmpeg
+ * and its value is reset to 100 instead of 0 to keep it above or equal to 100.
+ * Also we do not increase MICRO for every bugfix or change in git master.
+ *
+ * Prior to FFmpeg 3.2 point releases did not change any lib version number to
+ * avoid aliassing different git master checkouts.
+ * Starting with FFmpeg 3.2, the released library versions will occupy
+ * a separate MAJOR.MINOR that is not used on the master development branch.
+ * That is if we branch a release of master 55.10.123 we will bump to 55.11.100
+ * for the release and master will continue at 55.12.100 after it. Each new
+ * point release will then bump the MICRO improving the usefulness of the lib
+ * versions.
+ *
  * @{
  */
 
@@ -48,12 +69,6 @@
  * @}
  */
 
-/**
- * @file
- * @ingroup lavu
- * Libavutil version macros
- */
-
 /**
  * @defgroup lavu_ver Version and Build diagnostics
  *
@@ -64,7 +79,7 @@
  */
 
 #define LIBAVUTIL_VERSION_MAJOR  55
-#define LIBAVUTIL_VERSION_MINOR  28
+#define LIBAVUTIL_VERSION_MINOR  29
 #define LIBAVUTIL_VERSION_MICRO 100
 
 #define LIBAVUTIL_VERSION_INT   AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \
@@ -78,9 +93,7 @@
 #define LIBAVUTIL_IDENT         "Lavu" AV_STRINGIFY(LIBAVUTIL_VERSION)
 
 /**
- * @}
- *
- * @defgroup depr_guards Deprecation guards
+ * @defgroup lavu_depr_guards Deprecation Guards
  * FF_API_* defines may be placed below to indicate public API that will be
  * dropped at a future version bump. The defines themselves are not part of
  * the public API and may change, break or disappear at any time.
@@ -122,6 +135,7 @@
 
 
 /**
+ * @}
  * @}
  */