[FFmpeg-cvslog] Merge commit '832129431fd5c693b12c32a1563944c631feaf36'
Michael Niedermayer
git at videolan.org
Fri Jul 3 21:18:34 CEST 2015
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Jul 3 21:06:23 2015 +0200| [d563e13a7c7daa03c89636f85305e1839bcb27be] | committer: Michael Niedermayer
Merge commit '832129431fd5c693b12c32a1563944c631feaf36'
* commit '832129431fd5c693b12c32a1563944c631feaf36':
lavu: Add version information for av_version_info()
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=d563e13a7c7daa03c89636f85305e1839bcb27be
---
More information about the ffmpeg-cvslog
mailing list