[FFmpeg-cvslog] Merge commit 'a2c00d22e71d13b72828147be86aa9e961c6cae6'
Michael Niedermayer
git at videolan.org
Wed Oct 8 22:27:56 CEST 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Oct 8 22:20:33 2014 +0200| [dc5560efda8e956b20bed2cb955f060733bc3200] | committer: Michael Niedermayer
Merge commit 'a2c00d22e71d13b72828147be86aa9e961c6cae6'
* commit 'a2c00d22e71d13b72828147be86aa9e961c6cae6':
avprobe: print color properties for show_streams
Conflicts:
avprobe.c
Not merged as this code does not build and is incomplete, some parts only
appear in later commits.
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=dc5560efda8e956b20bed2cb955f060733bc3200
---
More information about the ffmpeg-cvslog
mailing list