Merge commit 'ae365453c370c85f278bff7fbf9e20d9d335cb2a'
authorHendrik Leppkes <h.leppkes@gmail.com>
Sun, 2 Aug 2015 08:38:33 +0000 (10:38 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Sun, 2 Aug 2015 08:38:33 +0000 (10:38 +0200)
* commit 'ae365453c370c85f278bff7fbf9e20d9d335cb2a':
  rc4: add av_rc4_alloc()

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
1  2 
doc/APIchanges
libavutil/rc4.c
libavutil/rc4.h

diff --cc doc/APIchanges
@@@ -15,9 -13,13 +15,10 @@@ libavutil:     2014-08-0
  
  API changes, most recent first:
  
 -2015-xx-xx - lavu 54.17.0
 +2015-xx-xx - lavu 54.30.0
    xxxxxxx -  Add av_blowfish_alloc().
+   xxxxxxx -  Add av_rc4_alloc().
  
 -2015-07-29 - 7e38340 - lavu 54.16.0 - hmac.h
 -  Add AV_HMAC_SHA224 and AV_HMAC_SHA256.
 -
  2015-xx-xx - lavc 56.35.0 - avcodec.h
    xxxxxxxxx - Rename CODEC_FLAG* defines to AV_CODEC_FLAG*.
    xxxxxxxxx - Rename CODEC_CAP_* defines to AV_CODEC_CAP_*.
diff --cc libavutil/rc4.c
Simple merge
diff --cc libavutil/rc4.h
Simple merge