ffmpeg | branch: master | Michael Niedermayer <[email protected]> | Fri Oct 17
20:45:43 2014 +0200| [45fed258ee6a58ca7e12a94936fa24b742d48f69] | committer:
Michael Niedermayer
Merge commit '66e9f839536238945fbfe9d2041b6891cb150e45'
* commit '66e9f839536238945fbfe9d2041b6891cb150e45':
libfdk-aacdec: Enable Dynamic Range Control Metadata Support
Conflicts:
libavcodec/version.h
Merged-by: Michael Niedermayer <[email protected]>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=45fed258ee6a58ca7e12a94936fa24b742d48f69
---
_______________________________________________
ffmpeg-cvslog mailing list
[email protected]
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
