[FFmpeg-cvslog] Merge commit '3e853ff7acc56b180950ab39e7282f1b938c8784'

[Hendrik Leppkes]

ffmpeg | branch: master | Hendrik Leppkes <h.leppkes at gmail.com> | Sun Aug  2 10:41:26 2015 +0200| [d95fee4425285e90604cda48375069f5ef090ce3] | committer: Hendrik Leppkes

Merge commit '3e853ff7acc56b180950ab39e7282f1b938c8784'

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

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d95fee4425285e90604cda48375069f5ef090ce3
---