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

[Sebastien Zwickert]

> On 11 Jul 2015, at 18:52, Michael Niedermayer <michael at niedermayer.cc> wrote:
> 
> 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

Thanks to you and James for clarifying. Sure, forgot this patch :)
As videotoolbox patch depends on this part of code I want to be sure
to use the correct value. I am missing that the micro is resetting each minor bump.

—
Sebastien Zwickert