ffmpeg | branch: master | Michael Niedermayer <[email protected]> | Fri Jul 3
03:20:09 2015 +0200| [e15e78f391abf4e037352cd783f6fa3c6b843d94] | committer:
Michael Niedermayer
Merge commit '1316df7aa98c4784f190d107206d0bb12c590b89'
* commit '1316df7aa98c4784f190d107206d0bb12c590b89':
lavu: add an API function to return the Libav version string
Conflicts:
.gitignore
Makefile
cmdutils.c
doc/APIchanges
libavutil/avutil.h
libavutil/utils.c
See: f91126643a91c2d3f8d8e210c8facaf259951b03
Merged-by: Michael Niedermayer <[email protected]>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e15e78f391abf4e037352cd783f6fa3c6b843d94
---
_______________________________________________
ffmpeg-cvslog mailing list
[email protected]
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
