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

[James Almer]

On 11/07/15 1:26 PM, 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

The library was bumped from 56.46.102 to 56.47.100. Micro is always reset
when there's a minor bump.

This patch is not needed.

>  
>  #define LIBAVCODEC_VERSION_INT  AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
>                                                 LIBAVCODEC_VERSION_MINOR, \
>