1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-02-09 14:14:39 +02:00
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
..
2014-07-20 02:01:50 +02:00
2015-07-27 15:24:56 +01:00
2015-07-29 18:58:40 +02:00
2015-07-26 21:54:13 +00:00
2015-04-23 23:56:21 -07:00
2014-05-28 03:52:50 +02:00
2014-12-01 00:31:06 +01:00
2015-02-02 05:04:14 +01:00