Hendrik Leppkes 3cf08e96fc Merge commit 'd9e8b47e3144262d6bc4681740411d4bdafad6ac' ...

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

Conflicts:
	libavutil/des.c

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

2015-08-02 10:41:16 +02:00

18 KiB

Raw Blame History

View Raw