Merge commit 'fb5cf145b6bcfa4f83af94398e5560c1132cc410'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 28 Mar 2014 09:59:16 +0000 (10:59 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 28 Mar 2014 10:00:27 +0000 (11:00 +0100)
* commit 'fb5cf145b6bcfa4f83af94398e5560c1132cc410':
  bmp: add a standalone parser

Conflicts:
Changelog
libavcodec/bmp_parser.c
libavcodec/version.h

See: 011ce89dba5c0c764abc5f39acb6368f580742e3 and others
Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/bmp_parser.c
libavcodec/version.h

Simple merge
@@@ -29,8 -29,8 +29,8 @@@
  #include "libavutil/version.h"
  
  #define LIBAVCODEC_VERSION_MAJOR 55
 -#define LIBAVCODEC_VERSION_MINOR 41
 -#define LIBAVCODEC_VERSION_MICRO  0
 +#define LIBAVCODEC_VERSION_MINOR  55
- #define LIBAVCODEC_VERSION_MICRO 103
++#define LIBAVCODEC_VERSION_MICRO 104
  
  #define LIBAVCODEC_VERSION_INT  AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
                                                 LIBAVCODEC_VERSION_MINOR, \