[FFmpeg-cvslog] avutil/version: Improve lib versioning scheme for release branches with the next major release

Michael Niedermayer git at videolan.org
Mon Aug 29 23:49:52 EEST 2016


ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Sat Aug  6 12:49:56 2016 +0200| [ac028794ad702375c27143bd86d459534ef6fc2f] | committer: Michael Niedermayer

avutil/version: Improve lib versioning scheme for release branches with the next major release

Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ac028794ad702375c27143bd86d459534ef6fc2f
---

 libavutil/version.h | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/libavutil/version.h b/libavutil/version.h
index dec1b1b..7d32c7b 100644
--- a/libavutil/version.h
+++ b/libavutil/version.h
@@ -41,6 +41,15 @@
  * 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.
+ *
  * @{
  */
 



More information about the ffmpeg-cvslog mailing list