[FFmpeg-cvslog] Merge commit '5a419b2dd1881889d436f55741fd3ff3f9f436c4'
Michael Niedermayer
git at videolan.org
Wed Oct 8 23:02:13 CEST 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Oct 8 22:53:48 2014 +0200| [bb44f7d5d7e48bd67fa24fbec4a28f9890e444aa] | committer: Michael Niedermayer
Merge commit '5a419b2dd1881889d436f55741fd3ff3f9f436c4'
* commit '5a419b2dd1881889d436f55741fd3ff3f9f436c4':
pixdesc: return color properties names
Conflicts:
libavutil/pixdesc.c
libavutil/pixdesc.h
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=bb44f7d5d7e48bd67fa24fbec4a28f9890e444aa
---
More information about the ffmpeg-cvslog
mailing list