Merge commit '3e853ff7acc56b180950ab39e7282f1b938c8784'
authorHendrik Leppkes <h.leppkes@gmail.com>
Sun, 2 Aug 2015 08:41:26 +0000 (10:41 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Sun, 2 Aug 2015 08:41:26 +0000 (10:41 +0200)
commitd95fee4425285e90604cda48375069f5ef090ce3
treee9c2c0d196d34f549a6a28686cc2f489f7665539
parent3cf08e96fc85ec59b9da2dc79dc1eefc67f5c72d
parent3e853ff7acc56b180950ab39e7282f1b938c8784
Merge commit '3e853ff7acc56b180950ab39e7282f1b938c8784'

* commit '3e853ff7acc56b180950ab39e7282f1b938c8784':
  des: extend av_des_init() doxy

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