[FFmpeg-cvslog] Merge commit '5b4797a21db900b7d509660b7a4d49829089b004'
Michael Niedermayer
git at videolan.org
Sun Jan 5 22:20:04 CET 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Jan 5 22:12:41 2014 +0100| [4cf4da9dc5814aebe8881d93b4a88f593b774448] | committer: Michael Niedermayer
Merge commit '5b4797a21db900b7d509660b7a4d49829089b004'
* commit '5b4797a21db900b7d509660b7a4d49829089b004':
avframe: add AV_FRAME_DATA_MATRIXENCODING side data type.
Conflicts:
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4cf4da9dc5814aebe8881d93b4a88f593b774448
---
More information about the ffmpeg-cvslog
mailing list