[FFmpeg-cvslog] Merge commit '5c437fb'
Michael Niedermayer
git at videolan.org
Sun Jan 5 22:10:12 CET 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Jan 5 21:55:58 2014 +0100| [751385fe3f6537b2f9d04d2055d23f49f5196efa] | committer: Michael Niedermayer
Merge commit '5c437fb'
* commit '5c437fb':
lavu: Add values for various Dolby flags to the AVMatrixEncoding enum.
Conflicts:
doc/APIchanges
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=751385fe3f6537b2f9d04d2055d23f49f5196efa
---
More information about the ffmpeg-cvslog
mailing list