Merge commit 'b469832de993dabbfe037bef59c68e90e82ebca5'
authorHendrik Leppkes <h.leppkes@gmail.com>
Sun, 2 Aug 2015 08:38:53 +0000 (10:38 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Sun, 2 Aug 2015 08:38:53 +0000 (10:38 +0200)
commit52566efd5cf8c40d4e5bf8d54fa3cfdab921baad
tree1f017d0b362ed8c835769894d08b0e1dbb9cf971
parenta130ec9540b4a56b315c24285623b867c4c6f95c
parentb469832de993dabbfe037bef59c68e90e82ebca5
Merge commit 'b469832de993dabbfe037bef59c68e90e82ebca5'

* commit 'b469832de993dabbfe037bef59c68e90e82ebca5':
  rc4: extend av_rc4_init() doxy

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