Merge commit '66e9f839536238945fbfe9d2041b6891cb150e45'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 17 Oct 2014 18:45:43 +0000 (20:45 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 17 Oct 2014 18:45:43 +0000 (20:45 +0200)
* commit '66e9f839536238945fbfe9d2041b6891cb150e45':
  libfdk-aacdec: Enable Dynamic Range Control Metadata Support

Conflicts:
libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/libfdk-aacdec.c
libavcodec/version.h

Simple merge
index 3e193e5d1b5f87a89055abe5325434e704abf991,6b5f6dcace697e90894a59ac21cb6c32d599bc6a..91db55023076810d5d1ecaef259a56ed1aee92dc
@@@ -29,8 -29,8 +29,8 @@@
  #include "libavutil/version.h"
  
  #define LIBAVCODEC_VERSION_MAJOR 56
 -#define LIBAVCODEC_VERSION_MINOR  5
 -#define LIBAVCODEC_VERSION_MICRO  2
 +#define LIBAVCODEC_VERSION_MINOR  8
- #define LIBAVCODEC_VERSION_MICRO 101
++#define LIBAVCODEC_VERSION_MICRO 102
  
  #define LIBAVCODEC_VERSION_INT  AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
                                                 LIBAVCODEC_VERSION_MINOR, \