-
Hendrik Leppkes authored
* commit 'd9e8b47e': des: add av_des_alloc() Conflicts: libavutil/des.c Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
3cf08e96
* commit 'd9e8b47e': des: add av_des_alloc() Conflicts: libavutil/des.c Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>