Merge commit '7a7df34c91e16ea8936f59524145a2cdd6b790f9'
authorHendrik Leppkes <h.leppkes@gmail.com>
Sun, 2 Aug 2015 08:38:12 +0000 (10:38 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Sun, 2 Aug 2015 08:38:12 +0000 (10:38 +0200)
commit9ed59f16e005554fe412bcc05b2ed40688f4fd16
tree2827c201867aaa7610ec8042a122295cf53b44f8
parent988ddfea5e32226448e353766c8d9b610914e087
parent7a7df34c91e16ea8936f59524145a2cdd6b790f9
Merge commit '7a7df34c91e16ea8936f59524145a2cdd6b790f9'

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

Conflicts:
doc/APIchanges
libavutil/version.h

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
doc/APIchanges
libavutil/blowfish.c
libavutil/blowfish.h
libavutil/version.h