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)
commit45fed258ee6a58ca7e12a94936fa24b742d48f69
treef3e90b2823234407ca009708f554b3c14d7cc1a6
parente18fc35a07f4ed31ca8c330388500677ca33a1f6
parent66e9f839536238945fbfe9d2041b6891cb150e45
Merge commit '66e9f839536238945fbfe9d2041b6891cb150e45'

* commit '66e9f839536238945fbfe9d2041b6891cb150e45':
  libfdk-aacdec: Enable Dynamic Range Control Metadata Support

Conflicts:
libavcodec/version.h

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