Merge commit '87bd298abeb901fe16383a0d267502cc7fc03878'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 19 Dec 2014 02:29:30 +0000 (03:29 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 19 Dec 2014 02:30:40 +0000 (03:30 +0100)
* commit '87bd298abeb901fe16383a0d267502cc7fc03878':
  DPX parser

Conflicts:
libavcodec/dpx_parser.c
libavcodec/version.h

See: 8ec328668a7d10c8224ae5f591add5b388ea82ed
Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/dpx_parser.c
libavcodec/version.h

Simple merge
@@@ -29,8 -29,8 +29,8 @@@
  #include "libavutil/version.h"
  
  #define LIBAVCODEC_VERSION_MAJOR 56
- #define LIBAVCODEC_VERSION_MINOR  15
- #define LIBAVCODEC_VERSION_MICRO 101
 -#define LIBAVCODEC_VERSION_MINOR  7
 -#define LIBAVCODEC_VERSION_MICRO  0
++#define LIBAVCODEC_VERSION_MINOR  16
++#define LIBAVCODEC_VERSION_MICRO 100
  
  #define LIBAVCODEC_VERSION_INT  AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
                                                 LIBAVCODEC_VERSION_MINOR, \