diff mbox

[FFmpeg-devel,2/2,RFC] avutil/version: Improve lib versioning sheme for release branches with the next major release

Message ID 20160806105254.1324-2-michael@niedermayer.cc
State Accepted
Headers show

Commit Message

Michael Niedermayer Aug. 6, 2016, 10:52 a.m. UTC
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
---
 libavutil/version.h | 9 +++++++++
 1 file changed, 9 insertions(+)

Comments

Moritz Barsnick Aug. 6, 2016, 1:26 p.m. UTC | #1
On Sat, Aug 06, 2016 at 12:52:54 +0200, Michael Niedermayer wrote:
> + * Prior FFmpeg 3.2 point releases did not change any lib version number to
      ^ Prior to

> + * a seperate MAJOR.MINOR that is not used on the master development branch
        ^ separate

> + * that is if we branch a release of master 55.10.123 we will bump to 55.11.100
      ^ . That is [I.e. split sentences here.]

> + * point release will then bump the MICRO improving the usefullness of the lib
                                                           ^ usefulness

Cheers,
Moritz
Carl Eugen Hoyos Aug. 8, 2016, 4:23 p.m. UTC | #2
2016-08-06 12:52 GMT+02:00 Michael Niedermayer <michael@niedermayer.cc>:
> + * Starting with FFmpeg 3.2, the released library versions will occupy
> + * a seperate MAJOR.MINOR that is not used on the master development branch

Sounds great.

Carl Eugen
Michael Niedermayer Aug. 29, 2016, 8:34 p.m. UTC | #3
On Sat, Aug 06, 2016 at 03:26:04PM +0200, Moritz Barsnick wrote:
> On Sat, Aug 06, 2016 at 12:52:54 +0200, Michael Niedermayer wrote:
> > + * Prior FFmpeg 3.2 point releases did not change any lib version number to
>       ^ Prior to
> 
> > + * a seperate MAJOR.MINOR that is not used on the master development branch
>         ^ separate
> 
> > + * that is if we branch a release of master 55.10.123 we will bump to 55.11.100
>       ^ . That is [I.e. split sentences here.]
> 
> > + * point release will then bump the MICRO improving the usefullness of the lib
>                                                            ^ usefulness

typos fixed
applied
thx

[...]
--
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

Breaking DRM is a little like attempting to break through a door even
though the window is wide open and the only thing in the house is a bunch
of things you dont want and which you would get tomorrow for free anyway
diff mbox

Patch

diff --git a/libavutil/version.h b/libavutil/version.h
index 7692def..c846a4e 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.
  *
+ * Prior 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 seperate 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 usefullness of the lib
+ * versions.
+ *
  * @{
  */