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)
* commit '3e853ff7acc56b180950ab39e7282f1b938c8784':
  des: extend av_des_init() doxy

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

diff --cc libavutil/des.h
Simple merge