aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/jacosub.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-10-17 20:45:43 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-10-17 20:45:43 +0200
commit45fed258ee6a58ca7e12a94936fa24b742d48f69 (patch)
treef3e90b2823234407ca009708f554b3c14d7cc1a6 /libavcodec/jacosub.h
parente18fc35a07f4ed31ca8c330388500677ca33a1f6 (diff)
parent66e9f839536238945fbfe9d2041b6891cb150e45 (diff)
downloadffmpeg-45fed258ee6a58ca7e12a94936fa24b742d48f69.tar.gz
Merge commit '66e9f839536238945fbfe9d2041b6891cb150e45'
* commit '66e9f839536238945fbfe9d2041b6891cb150e45': libfdk-aacdec: Enable Dynamic Range Control Metadata Support Conflicts: libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/jacosub.h')
0 files changed, 0 insertions, 0 deletions