Merge commit 'd9e8b47e3144262d6bc4681740411d4bdafad6ac'

* commit 'd9e8b47e3144262d6bc4681740411d4bdafad6ac': des: add av_des_alloc() Conflicts: libavutil/des.c

Hendrik Leppkes committed 11 years ago

Commit 3cf08e92 parents 9ca1997 d9e8b473 files · +34 −3Browse files

Showing the changes to doc/APIchanges (1 of 3 files). Show all

Unified · Split

@@ -19,6 +19,7 @@ API changes, most recent first: · 18 unmodified lines
19	xxxxxxx - Add av_blowfish_alloc().	19	xxxxxxx - Add av_blowfish_alloc().
20	xxxxxxx - Add av_rc4_alloc().	20	xxxxxxx - Add av_rc4_alloc().
21	xxxxxxx - Add av_xtea_alloc().	21	xxxxxxx - Add av_xtea_alloc().
		22	xxxxxxx - Add av_des_alloc().
22		23
23	2015-xx-xx - lavc 56.35.0 - avcodec.h	24	2015-xx-xx - lavc 56.35.0 - avcodec.h
24	xxxxxxxxx - Rename CODEC_FLAG* defines to AV_CODEC_FLAG*.	25	xxxxxxxxx - Rename CODEC_FLAG* defines to AV_CODEC_FLAG*.

Keyboard shortcuts