Hendrik Leppkes 9ed59f16e0 Merge commit '7a7df34c91e16ea8936f59524145a2cdd6b790f9' ...

* commit '7a7df34c91e16ea8936f59524145a2cdd6b790f9':
  blowfish: add av_blowfish_alloc()

Conflicts:
	doc/APIchanges
	libavutil/version.h

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

2015-08-02 10:38:12 +02:00

90 KiB

Raw Blame History

View Raw