[FFmpeg-cvslog] Merge commit 'd9e8b47e3144262d6bc4681740411d4bdafad6ac'

[Hendrik Leppkes]

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

Merge commit 'd9e8b47e3144262d6bc4681740411d4bdafad6ac'

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

Conflicts:
	libavutil/des.c

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

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