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)
commita130ec9540b4a56b315c24285623b867c4c6f95c
tree509257f38c3af574e38189633bc99e89f84b2b29
parent9ed59f16e005554fe412bcc05b2ed40688f4fd16
parentae365453c370c85f278bff7fbf9e20d9d335cb2a
Merge commit 'ae365453c370c85f278bff7fbf9e20d9d335cb2a'

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

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