[FFmpeg-cvslog] Merge commit 'ae365453c370c85f278bff7fbf9e20d9d335cb2a'

[Hendrik Leppkes]

ffmpeg | branch: master | Hendrik Leppkes <h.leppkes at gmail.com> | Sun Aug  2 10:38:33 2015 +0200| [a130ec9540b4a56b315c24285623b867c4c6f95c] | committer: Hendrik Leppkes

Merge commit 'ae365453c370c85f278bff7fbf9e20d9d335cb2a'

* commit 'ae365453c370c85f278bff7fbf9e20d9d335cb2a':
  rc4: add av_rc4_alloc()

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a130ec9540b4a56b315c24285623b867c4c6f95c
---