ffmpeg | branch: master | Hendrik Leppkes <h.lepp...@gmail.com> | Sun Aug 2
10:38:12 2015 +0200| [9ed59f16e005554fe412bcc05b2ed40688f4fd16] | committer:
Hendrik Leppkes
Merge commit '7a7df34c91e16ea8936f59524145a2cdd6b790f9'
* commit '7a7df34c91e16ea8936f59524145a2cdd6b790f9':
blowfish: add av_blowfish_alloc()
Conflicts:
doc/APIchanges
libavutil/version.h
Merged-by: Hendrik Leppkes <h.lepp...@gmail.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9ed59f16e005554fe412bcc05b2ed40688f4fd16
---
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
