[FFmpeg-devel] [PATCH] avcodec: fix micro version number decreased in merge conflict of 7871eb4.

Michael Niedermayer michael at niedermayer.cc
Sat Jul 11 18:52:40 CEST 2015


On Sat, Jul 11, 2015 at 06:26:51PM +0200, Sebastien Zwickert wrote:
> ---
>  libavcodec/version.h | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/libavcodec/version.h b/libavcodec/version.h
> index ee21f5d..a9b9e25 100644
> --- a/libavcodec/version.h
> +++ b/libavcodec/version.h
> @@ -30,7 +30,7 @@
>  
>  #define LIBAVCODEC_VERSION_MAJOR 56
>  #define LIBAVCODEC_VERSION_MINOR  47
> -#define LIBAVCODEC_VERSION_MICRO 100
> +#define LIBAVCODEC_VERSION_MICRO 102

minor increased from 46 to 47 in 7871eb4 so micro was reset to 100
this should have been correct unless iam missing something

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

Frequently ignored answer#1 FFmpeg bugs should be sent to our bugtracker. User
questions about the command line tools should be sent to the ffmpeg-user ML.
And questions about how to use libav* should be sent to the libav-user ML.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 181 bytes
Desc: Digital signature
URL: <http://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20150711/609c7160/attachment.sig>


More information about the ffmpeg-devel mailing list