Merge commit 'd9e8b47e3144262d6bc4681740411d4bdafad6ac'
authorHendrik Leppkes <h.leppkes@gmail.com>
Sun, 2 Aug 2015 08:41:16 +0000 (10:41 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Sun, 2 Aug 2015 08:41:16 +0000 (10:41 +0200)
commit3cf08e96fc85ec59b9da2dc79dc1eefc67f5c72d
tree24a53de6e365472dd8758444d8139b68070b0677
parent9ca19971bcdd1af39680c15a0319d57505b9542b
parentd9e8b47e3144262d6bc4681740411d4bdafad6ac
Merge commit 'd9e8b47e3144262d6bc4681740411d4bdafad6ac'

* commit 'd9e8b47e3144262d6bc4681740411d4bdafad6ac':
  des: add av_des_alloc()

Conflicts:
libavutil/des.c

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