diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-17 20:45:43 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-10-17 20:45:43 +0200 |
| commit | 45fed258ee6a58ca7e12a94936fa24b742d48f69 (patch) | |
| tree | f3e90b2823234407ca009708f554b3c14d7cc1a6 /libavformat/segment.c | |
| parent | e18fc35a07f4ed31ca8c330388500677ca33a1f6 (diff) | |
| parent | 66e9f839536238945fbfe9d2041b6891cb150e45 (diff) | |
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 'libavformat/segment.c')
0 files changed, 0 insertions, 0 deletions