[FFmpeg-devel] [PATCH 2/2] Add changelog entry and minor bump for applehttp protocol

[Martin Storsjö]

On Mon, 7 Mar 2011, Anton Khirnov wrote:

> On Mon, Mar 07, 2011 at 12:33:48PM +0200, Martin Storsj? wrote:
> > ---
> >  Changelog             |    1 +
> >  libavformat/version.h |    2 +-
> >  2 files changed, 2 insertions(+), 1 deletions(-)
> > 
> > diff --git a/Changelog b/Changelog
> > index dc47dab..78a6cf5 100644
> > --- a/Changelog
> > +++ b/Changelog
> > @@ -77,6 +77,7 @@ version <next>:
> >  - Wing Commander IV movies decoder added
> >  - movie source added
> >  - Bink version 'b' audio and video decoder
> > +- Apple HTTP Live Streaming protocol handler
> >  
> >  
> >  version 0.6:
> > diff --git a/libavformat/version.h b/libavformat/version.h
> > index aed8908..ae2f580 100644
> > --- a/libavformat/version.h
> > +++ b/libavformat/version.h
> > @@ -24,7 +24,7 @@
> >  #include "libavutil/avutil.h"
> >  
> >  #define LIBAVFORMAT_VERSION_MAJOR 52
> > -#define LIBAVFORMAT_VERSION_MINOR 103
> > +#define LIBAVFORMAT_VERSION_MINOR 104
> 
> What's the point of the second bump immediately following the first one?
> Just merge them.

Yeah, since the first minor bump was missed when applied and another one 
coming at the same time, I guess they can be merged.

// Martin