[FFmpeg-cvslog] Merge commit 'e7c5e17d4fbd7c83fb331bf327e25ebd8e6a8623'
Michael Niedermayer
git at videolan.org
Wed May 13 22:43:05 CEST 2015
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed May 13 22:34:59 2015 +0200| [cc48409b51c8cd8fed8038c00ea8b4a6b2341004] | committer: Michael Niedermayer
Merge commit 'e7c5e17d4fbd7c83fb331bf327e25ebd8e6a8623'
* commit 'e7c5e17d4fbd7c83fb331bf327e25ebd8e6a8623':
vda: Make output CVPixelBuffer format configurable
Conflicts:
doc/APIchanges
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=cc48409b51c8cd8fed8038c00ea8b4a6b2341004
---
More information about the ffmpeg-cvslog
mailing list